From: Andrei Pavel Date: Fri, 23 Dec 2016 16:54:45 +0000 (+0200) Subject: Removed "--nonet" from all xsltproc commands. X-Git-Tag: trac5524_base~16^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c0383ae4881368602770494b12aa006ed98e164;p=thirdparty%2Fkea.git Removed "--nonet" from all xsltproc commands. --nonet prevented XSL files from being downloaded and thus prevented make commands from terminating succesfully. Supposedly, on some machines --nonet works and is faster. --- diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am index 561c142893..db750fe52e 100644 --- a/doc/guide/Makefile.am +++ b/doc/guide/Makefile.am @@ -22,7 +22,7 @@ kea-messages.xml: if GENERATE_DOCS kea-guide.html: $(DOCBOOK) - @XSLTPROC@ --novalid --xinclude --nonet \ + @XSLTPROC@ --novalid --xinclude \ --path $(top_builddir)/doc \ -o $@ \ --stringparam section.autolabel 1 \ @@ -35,7 +35,7 @@ kea-guide.txt: kea-guide.html @ELINKS@ -dump -no-numbering -no-references kea-guide.html > $@ kea-messages.html: kea-messages.xml - @XSLTPROC@ --novalid --xinclude --nonet \ + @XSLTPROC@ --novalid --xinclude \ --path $(top_builddir)/doc \ -o $@ \ --stringparam generate.toc "book toc" \ diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am index a71ee1c737..775e4cee2f 100644 --- a/src/bin/admin/Makefile.am +++ b/src/bin/admin/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = $(man_MANS) kea-admin.xml admin-utils.sh if GENERATE_DOCS kea-admin.8: kea-admin.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml + @XSLTPROC@ --novalid --xinclude -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml else diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am index 895865e4da..bc6627ce20 100644 --- a/src/bin/d2/Makefile.am +++ b/src/bin/d2/Makefile.am @@ -35,7 +35,7 @@ EXTRA_DIST += images/trans_classes.svg images/update_exec_classes.svg if GENERATE_DOCS kea-dhcp-ddns.8: kea-dhcp-ddns.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ + @XSLTPROC@ --novalid --xinclude -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/kea-dhcp-ddns.xml diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index 8360677861..4a6ec7ccc1 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST += dhcp4.dox dhcp4_hooks.dox dhcp4o6.dox if GENERATE_DOCS kea-dhcp4.8: kea-dhcp4.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ + @XSLTPROC@ --novalid --xinclude -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/kea-dhcp4.xml diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index 7653582e65..b307b246a7 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -30,7 +30,7 @@ EXTRA_DIST += dhcp6.dox dhcp6_hooks.dox dhcp4o6.dox if GENERATE_DOCS kea-dhcp6.8: kea-dhcp6.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ + @XSLTPROC@ --novalid --xinclude -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/kea-dhcp6.xml diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am index c83a597457..223a6e1939 100644 --- a/src/bin/keactrl/Makefile.am +++ b/src/bin/keactrl/Makefile.am @@ -19,7 +19,7 @@ BUILT_SOURCES = kea.conf if GENERATE_DOCS keactrl.8: keactrl.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml + @XSLTPROC@ --novalid --xinclude -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml else diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am index 7bfeb96df7..91dee0672b 100644 --- a/src/bin/lfc/Makefile.am +++ b/src/bin/lfc/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = $(man_MANS) kea-lfc.xml lfc.dox if GENERATE_DOCS kea-lfc.8: kea-lfc.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ + @XSLTPROC@ --novalid --xinclude -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ $(srcdir)/kea-lfc.xml diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am index 74d2975bab..6824093924 100644 --- a/src/bin/perfdhcp/Makefile.am +++ b/src/bin/perfdhcp/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST += $(man_MANS) perfdhcp.xml if GENERATE_DOCS perfdhcp.8: perfdhcp.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml + @XSLTPROC@ --novalid --xinclude -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml else diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am index 9fb4c96b3b..c96fd2498b 100644 --- a/src/bin/sockcreator/Makefile.am +++ b/src/bin/sockcreator/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) kea-sockcreator.xml if GENERATE_DOCS kea-sockcreator.8: kea-sockcreator.xml - @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml + @XSLTPROC@ --novalid --xinclude -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml else