diff options
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 20 | ||||
-rw-r--r-- | doc/Makefile.am | 7 |
3 files changed, 17 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 7fae33e0f..41967a513 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -1,11 +1,7 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include | 2 | AM_CPPFLAGS = -I$(top_srcdir)/src/include |
3 | 3 | ||
4 | if DOC_ONLY | 4 | SUBDIRS = doc m4 src po pkgconfig |
5 | SUBDIRS = doc m4 po pkgconfig | ||
6 | else | ||
7 | SUBDIRS = doc m4 src po pkgconfig | ||
8 | endif | ||
9 | 5 | ||
10 | if !TALER_ONLY | 6 | if !TALER_ONLY |
11 | SUBDIRS += contrib | 7 | SUBDIRS += contrib |
diff --git a/configure.ac b/configure.ac index 68922e6c0..145a6aaff 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -597,19 +597,19 @@ AC_CHECK_LIB([kstat],[kstat_open]) | |||
597 | 597 | ||
598 | # should the build process be restricted to only building | 598 | # should the build process be restricted to only building |
599 | # the documentation? | 599 | # the documentation? |
600 | AC_MSG_CHECKING(whether to build documentation ONLY) | 600 | AC_MSG_CHECKING(whether to build documentation) |
601 | AC_ARG_ENABLE([documentation], | 601 | AC_ARG_ENABLE([documentation], |
602 | [AS_HELP_STRING([--enable-documentation], [only build the documentation])], | 602 | [AS_HELP_STRING([--enable-documentation], [build the documentation])], |
603 | [doc_only=${enableval}], | 603 | [documentation=${enableval}], |
604 | [doc_only=no]) | 604 | [documentation=yes]) |
605 | AC_MSG_RESULT($doc_only) | 605 | AC_MSG_RESULT($documentation) |
606 | if test "x$doc_only" = "xyes" | 606 | if test "x$documentation" = "xyes" |
607 | then | 607 | then |
608 | AM_CONDITIONAL([DOC_ONLY],true) | 608 | AM_CONDITIONAL([DOCUMENTATION],true) |
609 | AC_DEFINE([DOC_ONLY],[1],[Building the documentation]) | 609 | AC_DEFINE([DOCUMENTATION],[1],[Building the documentation]) |
610 | else | 610 | else |
611 | AM_CONDITIONAL([DOC_ONLY],false) | 611 | AM_CONDITIONAL([DOCUMENTATION],false) |
612 | AC_DEFINE([DOC_ONLY],[0],[Canonical compilation]) | 612 | AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation]) |
613 | fi | 613 | fi |
614 | 614 | ||
615 | # should the build process be restricted to the code required | 615 | # should the build process be restricted to the code required |
diff --git a/doc/Makefile.am b/doc/Makefile.am index ab8ccc4b5..28db606c5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -1,5 +1,10 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | SUBDIRS = man doxygen documentation | 2 | if DOCUMENTATION |
3 | SUBDIRS = man doxygen documentation | ||
4 | endif | ||
5 | if !DOCUMENTATION | ||
6 | SUBDIRS = man doxygen | ||
7 | endif | ||
3 | 8 | ||
4 | EXTRA_DIST = \ | 9 | EXTRA_DIST = \ |
5 | outdated-and-old-installation-instructions.txt | 10 | outdated-and-old-installation-instructions.txt |