[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: add ability to build manpag
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: add ability to build manpages independent from other documentation choices |
Date: |
Mon, 01 Apr 2019 20:04:23 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 8e50f39a2 add ability to build manpages independent from other
documentation choices
new 1d17d1aa2 Merge branch 'dev/ng0/5673_5616'
8e50f39a2 is described below
commit 8e50f39a2c1ba03011bd1e5c51d0721f220e2e7a
Author: ng0 <address@hidden>
AuthorDate: Mon Apr 1 14:06:27 2019 +0000
add ability to build manpages independent from other documentation choices
---
Makefile.am | 8 ++++++++
configure.ac | 16 ++++++++++++++++
doc/Makefile.am | 9 +++++++--
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fd18d7c3c..f54ff203f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,21 @@
# This Makefile.am is in the public domain
AM_CPPFLAGS = -I$(top_srcdir)/src/include
+# only documentation (ALL of the documentation)
if DOCUMENTATION_ONLY
SUBDIRS = doc
else
SUBDIRS = m4 src po pkgconfig
+endif
+
+# documentation on / off switch (affects all of the documentation)
if DOCUMENTATION
SUBDIRS += doc
endif
+
+# only manpages, needs "doc" subdir
+if INCLUDE_MANPAGES
+ SUBDIRS += doc
endif
if !TALER_ONLY
diff --git a/configure.ac b/configure.ac
index a8c80eb7d..4f6b69e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,6 +375,21 @@ else
AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation])
fi
+# should the build process be including the manpages? (default: yes)
+AC_MSG_CHECKING(whether to include man pages)
+AC_ARG_ENABLE([include-manpages],
+ [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages
in build and installation])],
+ [include_manpages=${enableval}],
+ [include_manpages=yes])
+AC_MSG_RESULT($include_manpages)
+if test "x$include_manpages" = "xyes"
+then
+ AM_CONDITIONAL([INCLUDE_MANPAGES],true)
+ AC_DEFINE([INCLUDE_MANPAGES],[1],[Including the man pages in the build and
installation])
+else
+ AM_CONDITIONAL([INCLUDE_MANPAGES],false)
+ AC_DEFINE([INCLUDE_MANPAGES],[0],[Not including the man pages in the build
and installation])
+fi
# Adam shostack suggests the following for Windows:
# -D_FORTIFY_SOURCE=2 -fstack-protector-all
@@ -1326,6 +1341,7 @@ DATAROOTDIR=$datarootdir
AC_SUBST(DATAROOTDIR)
# test for sudo
+# TODO: do we need to change anything for "doas" on openbsd?
AC_MSG_CHECKING(for sudo)
AC_ARG_WITH(sudo,
[ --with-sudo=PATH path to sudo binary (or just yes)],
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4443b42f8..eb23b534b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,14 @@
# This Makefile.am is in the public domain
if DOCUMENTATION
- SUBDIRS = man doxygen handbook tutorial
+ SUBDIRS = doxygen handbook tutorial
endif
+
if !DOCUMENTATION
- SUBDIRS = man doxygen
+ SUBDIRS = doxygen
+endif
+
+if INCLUDE_MANPAGES
+ SUBDIRS += man
endif
EXTRA_DIST = \
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: add ability to build manpages independent from other documentation choices,
gnunet <=