man: fix distcheck

Also, we can get rid of tools/manpages-docbook.xsl and just specify
the canonical URL directly.

diff --git a/man/Makefile.am b/man/Makefile.am
index fdf2041..b7694ca 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,26 +1,19 @@
 man_MANS =
 CLEANFILES =
+EXTRA_DIST =
 
 if ENABLE_DOC
 
-XSLTPROC = xsltproc --xinclude --nonet
-
-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
+XSLTPROC = xsltproc
 
 XSLTPROC_FLAGS = \
-        --nonet \
-        --stringparam man.output.quietly 1 \
-        --stringparam funcsynopsis.style ansi \
-        --stringparam man.th.extra1.suppress 1 \
-        --stringparam man.authors.section.enabled 0 \
-        --stringparam man.copyright.section.enabled 0
+       --xinclude \
+       --nonet \
+       --stringparam man.output.quietly 1 \
+       --stringparam funcsynopsis.style ansi \
+       --stringparam man.th.extra1.suppress 1 \
+       --stringparam man.authors.section.enabled 0 \
+       --stringparam man.copyright.section.enabled 0
 
 XSLTPROC_MAN_FLAGS = $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
@@ -30,12 +23,32 @@ XSLTPROC_MAN_FLAGS = $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xs
 %.5: %.xml
        $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
 
-man_MANS +=                            \
-       NetworkManager.8                \
-       NetworkManager.conf.5           \
-       nm-system-settings.conf.5       \
-       nm-online.1                     \
+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
+
+
+configure_generated_man_pages =                \
        nmcli.1                         \
+       nm-online.1                     \
+       nm-system-settings.conf.5
+
+docbook_generated_man_pages =          \
+       NetworkManager.8                \
+       NetworkManager.conf.5
+
+CLEANFILES += $(docbook_generated_man_pages)
+EXTRA_DIST += $(docbook_generated_man_pages:.%=.xml)
+
+docbook_autogenerated_man_pages =      \
        nm-settings.5
 
+CLEANFILES += $(docbook_autogenerated_man_pages)
+
+man_MANS +=                                    \
+       $(configure_generated_man_pages)        \
+       $(docbook_generated_man_pages)          \
+       $(docbook_autogenerated_man_pages)
+
 endif

diff --git a/tools/Makefile.am b/tools/Makefile.am
index beb9837..a6c14ef 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,6 +23,5 @@ generate_settings_spec_LDADD = \
 
 EXTRA_DIST = \
        doc-generator.xsl \
-       manpages-docbook.xsl \
        check-exports.sh \
        $(GENERATE_SETTINGS_SPEC_SOURCE)

diff --git a/tools/manpages-docbook.xsl b/tools/manpages-docbook.xsl
deleted file mode 100644 (file)
index 15e87a0..0000000
--- a/tools/manpages-docbook.xsl
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               version='1.0'>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
-</xsl:stylesheet>