colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

man: fix distcheck

Browse Source 
Also, we can get rid of tools/manpages-docbook.xsl and just specify
the canonical URL directly.
This commit is contained in:
Dan Winship
2013-05-02 11:20:42 -04:00
parent 2699de9383
commit b39b4e9cf3
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
man/Makefile.am
View File

@@ -1,26 +1,19 @@
man_MANS = man_MANS =
CLEANFILES = CLEANFILES =
EXTRA_DIST =
if ENABLE_DOC if ENABLE_DOC
XSLTPROC = xsltproc --xinclude --nonet XSLTPROC = xsltproc
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_FLAGS = \ XSLTPROC_FLAGS = \
--nonet \ --xinclude \
--stringparam man.output.quietly 1 \ --nonet \
--stringparam funcsynopsis.style ansi \ --stringparam man.output.quietly 1 \
--stringparam man.th.extra1.suppress 1 \ --stringparam funcsynopsis.style ansi \
--stringparam man.authors.section.enabled 0 \ --stringparam man.th.extra1.suppress 1 \
--stringparam man.copyright.section.enabled 0 --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 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 %.5: %.xml
$(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $< $(AM_V_GEN) xsltproc $(XSLTPROC_MAN_FLAGS) $<
man_MANS += \ nm-settings.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la
NetworkManager.8 \ rm -f $(builddir)/$@
NetworkManager.conf.5 \ $(top_builddir)/tools/generate-settings-spec refentry $(builddir)/$@
nm-system-settings.conf.5 \ CLEANFILES += nm-settings.xml
nm-online.1 \
configure_generated_man_pages = \
nmcli.1 \ 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 nm-settings.5
CLEANFILES += $(docbook_autogenerated_man_pages)
man_MANS += \
$(configure_generated_man_pages) \
$(docbook_generated_man_pages) \
$(docbook_autogenerated_man_pages)
endif endif

1
tools/Makefile.am
View File

@@ -23,6 +23,5 @@ generate_settings_spec_LDADD = \
EXTRA_DIST = \ EXTRA_DIST = \
doc-generator.xsl \ doc-generator.xsl \
manpages-docbook.xsl \
check-exports.sh \ check-exports.sh \
$(GENERATE_SETTINGS_SPEC_SOURCE) $(GENERATE_SETTINGS_SPEC_SOURCE)

5
tools/manpages-docbook.xsl
View File

@@ -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>