build-sys: allow building man pages even if disabled in ./configure

This is purely for developer convenience: building man pages is slow
so people tend to disable them when not working on documentation. But
sometimes it is useful to build the man page to look something up,
especially when working on an older machine which has outdated
documentation, or to test some change to documentation. The rules to build
man pages are now outside of the ENABLE_MANPAGES conditional, but they
are not used unless manually invoked, and only the inclusion of man
pages in build and install targets is affected by the conditional.

Also, more generated files are removed in clean, which seems to be
good thing, and Makefile.am is simplified.

diff --git a/Makefile.am b/Makefile.am
index e895bc8cec1dd44bceee2eee533a16ec24dc0f8c..f09161d125a9e266e8446a8a43dc5f8c3010abf7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -694,29 +694,27 @@ man_MANS = \
 
 noinst_DATA += \
        $(HTML_FILES) \
-       $(HTML_ALIAS)
+       $(HTML_ALIAS) \
+       docs/html/man
+endif
 
 CLEANFILES += \
        $(man_MANS) \
        $(HTML_FILES) \
-       $(HTML_ALIAS)
+       $(HTML_ALIAS) \
+       docs/html/man
 
 docs/html/man:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_LN)$(LN_S) -f ../../man $@
 
-noinst_DATA += \
-       docs/html/man
-
-CLEANFILES += \
-       docs/html/man
-
-if HAVE_PYTHON
 man/index.html: man/systemd.index.html
        $(AM_V_LN)$(LN_S) -f systemd.index.html $@
 
+if HAVE_PYTHON
 noinst_DATA += \
        man/index.html
+endif
 
 CLEANFILES += \
        man/index.html
@@ -745,11 +743,6 @@ CLEANFILES += \
        man/systemd.index.xml \
        man/systemd.directives.xml
 
-
-endif
-
-endif
-
 EXTRA_DIST += \
        $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
        tools/make-man-index.py \
@@ -6014,7 +6007,6 @@ EXTRA_DIST += \
        $(polkitpolicy_in_in_files)
 
 # ------------------------------------------------------------------------------
-if ENABLE_MANPAGES
 man/custom-entities.ent: configure.ac
        $(AM_V_GEN)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
@@ -6062,8 +6054,6 @@ define html-alias
        $(AM_V_LN)$(LN_S) -f $(notdir $<) $@
 endef
 
-endif
-
 EXTRA_DIST += \
        man/custom-html.xsl \
        man/custom-man.xsl

diff --git a/configure.ac b/configure.ac
index 3128ca867276e0821e28fc79fc626c58e11a88c3..228d5ee1dae84a85f67b8c36384174a2a5cd3198 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1301,9 +1301,9 @@ AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
 # ------------------------------------------------------------------------------
 have_manpages=no
 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
+AC_PATH_PROG([XSLTPROC], [xsltproc])
 AS_IF([test "x$enable_manpages" != xno], [
        have_manpages=yes
-       AC_PATH_PROG([XSLTPROC], [xsltproc])
        AS_IF([test -z "$XSLTPROC"],
              AC_MSG_ERROR([*** xsltproc is required for man pages]))
 ])