picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-12-25 21:20:47 -05:00
parent d9a090b995
commit ab6f56debf
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Makefile.am
View file

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

2
configure.ac
View file

@ -1301,9 +1301,9 @@ AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
have_manpages=no have_manpages=no
AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
AC_PATH_PROG([XSLTPROC], [xsltproc])
AS_IF([test "x$enable_manpages" != xno], [ AS_IF([test "x$enable_manpages" != xno], [
have_manpages=yes have_manpages=yes
AC_PATH_PROG([XSLTPROC], [xsltproc])
AS_IF([test -z "$XSLTPROC"], AS_IF([test -z "$XSLTPROC"],
AC_MSG_ERROR([*** xsltproc is required for man pages])) AC_MSG_ERROR([*** xsltproc is required for man pages]))
]) ])