aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-04-01 14:06:27 +0000
committerng0 <ng0@n0.is>2019-04-01 14:06:27 +0000
commit8e50f39a2c1ba03011bd1e5c51d0721f220e2e7a (patch)
treea5fdc478c3350c8945fb77efa41ccf04823522df
parent1238b1f27382971a5ad0ad07ea0ed30b6d3aad17 (diff)
downloadgnunet-8e50f39a2c1ba03011bd1e5c51d0721f220e2e7a.tar.gz
gnunet-8e50f39a2c1ba03011bd1e5c51d0721f220e2e7a.zip
add ability to build manpages independent from other documentation choices
-rw-r--r--Makefile.am8
-rw-r--r--configure.ac16
-rw-r--r--doc/Makefile.am9
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 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2AM_CPPFLAGS = -I$(top_srcdir)/src/include 2AM_CPPFLAGS = -I$(top_srcdir)/src/include
3 3
4# only documentation (ALL of the documentation)
4if DOCUMENTATION_ONLY 5if DOCUMENTATION_ONLY
5 SUBDIRS = doc 6 SUBDIRS = doc
6else 7else
7 SUBDIRS = m4 src po pkgconfig 8 SUBDIRS = m4 src po pkgconfig
9endif
10
11# documentation on / off switch (affects all of the documentation)
8if DOCUMENTATION 12if DOCUMENTATION
9 SUBDIRS += doc 13 SUBDIRS += doc
10endif 14endif
15
16# only manpages, needs "doc" subdir
17if INCLUDE_MANPAGES
18 SUBDIRS += doc
11endif 19endif
12 20
13if !TALER_ONLY 21if !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
375 AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation]) 375 AC_DEFINE([DOCUMENTATION_ONLY],[0],[Not building only the documentation])
376fi 376fi
377 377
378# should the build process be including the manpages? (default: yes)
379AC_MSG_CHECKING(whether to include man pages)
380AC_ARG_ENABLE([include-manpages],
381 [AS_HELP_STRING([--disable-include-manpages], [Do not include the man pages in build and installation])],
382 [include_manpages=${enableval}],
383 [include_manpages=yes])
384AC_MSG_RESULT($include_manpages)
385if test "x$include_manpages" = "xyes"
386then
387 AM_CONDITIONAL([INCLUDE_MANPAGES],true)
388 AC_DEFINE([INCLUDE_MANPAGES],[1],[Including the man pages in the build and installation])
389else
390 AM_CONDITIONAL([INCLUDE_MANPAGES],false)
391 AC_DEFINE([INCLUDE_MANPAGES],[0],[Not including the man pages in the build and installation])
392fi
378 393
379# Adam shostack suggests the following for Windows: 394# Adam shostack suggests the following for Windows:
380# -D_FORTIFY_SOURCE=2 -fstack-protector-all 395# -D_FORTIFY_SOURCE=2 -fstack-protector-all
@@ -1326,6 +1341,7 @@ DATAROOTDIR=$datarootdir
1326AC_SUBST(DATAROOTDIR) 1341AC_SUBST(DATAROOTDIR)
1327 1342
1328# test for sudo 1343# test for sudo
1344# TODO: do we need to change anything for "doas" on openbsd?
1329AC_MSG_CHECKING(for sudo) 1345AC_MSG_CHECKING(for sudo)
1330AC_ARG_WITH(sudo, 1346AC_ARG_WITH(sudo,
1331 [ --with-sudo=PATH path to sudo binary (or just yes)], 1347 [ --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 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2if DOCUMENTATION 2if DOCUMENTATION
3 SUBDIRS = man doxygen handbook tutorial 3 SUBDIRS = doxygen handbook tutorial
4endif 4endif
5
5if !DOCUMENTATION 6if !DOCUMENTATION
6 SUBDIRS = man doxygen 7 SUBDIRS = doxygen
8endif
9
10if INCLUDE_MANPAGES
11 SUBDIRS += man
7endif 12endif
8 13
9EXTRA_DIST = \ 14EXTRA_DIST = \