From 6ea196de0e04103bbe6019b4690c9ff99721f0b7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 9 Feb 2013 11:54:35 -0500 Subject: [PATCH] man: Fix previous commit to honor --disable-doc In that mode, we shouldn't attempt to generate any manpages. While we're here, rewrite this file (using nonrecursive style) so we don't install non-generated ones either. Signed-off-by: Colin Walters --- man/Makefile.am | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 66863db58c..d39f5bb023 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,24 +1,20 @@ +man_MANS = +CLEANFILES = if ENABLE_DOC XSLTPROC = xsltproc --xinclude --nonet -GENERATED_FILES = nm-settings.xml nm-settings.5 - nm-settings.5: nm-settings.xml $(XSLTPROC) $(top_srcdir)/tools/manpages-docbook.xsl $(builddir)/nm-settings.xml +CLEANFILES += nm-settings.5 nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la rm -f $(builddir)/$@ $(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@ +CLEANFILES += nm-settings.xml -else - -GENERATED_FILES = - -endif - -man_MANS = \ +man_MANS += \ NetworkManager.8 \ NetworkManager.conf.5 \ nm-system-settings.conf.5 \ @@ -27,14 +23,12 @@ man_MANS = \ nmcli.1 \ nm-settings.5 +endif + EXTRA_DIST = \ - $(man_MANS) \ NetworkManager.8.in \ NetworkManager.conf.5.in \ nm-system-settings.conf.5.in \ nm-tool.1.in \ nm-online.1.in \ nmcli.1.in - -CLEANFILES = $(man_MANS) $(GENERATED_FILES) -