summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-12-25 21:20:47 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-01-18 16:19:13 -0500
commitab6f56debf65d64655830605c47d2212e7cca790 (patch)
treec2db0d480530768a4569b11f0bc528c9b3af976e /Makefile.am
parentd9a090b9957b04ec34a145a0a40f41abafe73917 (diff)
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am24
1 files changed, 7 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index e895bc8cec..f09161d125 100644
--- 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