It was impossible to disable the man pages generation before this patch.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org --- Makefile.am | 20 ++++++++++---------- configure.ac | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 4370355c34b8..dadb50941269 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,27 +42,27 @@ nitsidir = $(pythondir)/nitsi # ------------------------------------------------------------------------------
.PHONY: man -man: $(MANPAGES) $(MANPAGES_HTML) +man: $(MAN_PAGES) $(MAN_PAGES_HTML)
-if ENABLE_MANPAGES -MANPAGES = \ +if ENABLE_MAN_PAGES +MAN_PAGES = \ man/nitsi.1
-MANPAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MANPAGES))) -MANPAGES_HTML = $(patsubst %.xml,%.html,$(MANPAGES_XML)) +MAN_PAGES_XML = $(patsubst %.1,%.xml,$(patsubst %.5,%.xml,$(MAN_PAGES))) +MAN_PAGES_HTML = $(patsubst %.xml,%.html,$(MAN_PAGES_XML))
man_MANS = \ - $(MANPAGES) + $(MAN_PAGES)
noinst_DATA += \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML)
CLEANFILES += \ $(man_MANS) \ - $(MANPAGES_HTML) + $(MAN_PAGES_HTML)
EXTRA_DIST += \ - $(MANPAGES_XML) \ + $(MAN_PAGES_XML) \ man/custom-html.xsl
XSLTPROC_FLAGS = \ @@ -102,4 +102,4 @@ SED_PROCESS = \ < $< > $@
nitsi: nitsi.in Makefile - $(SED_PROCESS) \ No newline at end of file + $(SED_PROCESS) diff --git a/configure.ac b/configure.ac index 279309bf538d..23b69d5ed886 100644 --- a/configure.ac +++ b/configure.ac @@ -43,11 +43,11 @@ PKG_PROG_PKG_CONFIG m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
# ------------------------------------------------------------------------------ -have_manpages=no -AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages], +have_man_pages=no +AC_ARG_ENABLE(man-pages, AS_HELP_STRING([--disable-man-pages], [do not install man pages])) -AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) -AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) +AS_IF([test "x$enable_man_pages" != xno], [have_man_pages=yes]) +AM_CONDITIONAL(ENABLE_MAN_PAGES, [test "x$have_man_pages" = "xyes"])
# ------------------------------------------------------------------------------
@@ -62,5 +62,5 @@ AC_MSG_RESULT([ prefix: ${prefix} sysconfdir: ${sysconfdir}
- Generate man-pages: ${have_manpages} -]) \ No newline at end of file + Generate man-pages: ${have_man_pages} +])