[1687] use @XSLTPROC@ macro instead of xsltproc

to get the full path if needed also fixed one target that had spaces instead of tab
2025-08-30 13:37:55 +00:00 · 2012-08-02 20:06:04 -05:00
parent 4ed645f5f1
commit 777bf970e3
18 changed files with 20 additions and 20 deletions
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = bind10-guide.xml bind10-messages.xml
 CLEANFILES = $(HTMLDOCS) $(DOCS) bind10-messages.xml

 bind10-guide.html: bind10-guide.xml
-	xsltproc --novalid --xinclude --nonet \
+	@XSLTPROC@ --novalid --xinclude --nonet \
 		--path $(top_builddir)/doc \
 		-o $@ \
 		--stringparam section.autolabel 1 \
@@ -28,7 +28,7 @@ bind10-guide.txt: bind10-guide.html
 	$(HTML2TXT) bind10-guide.html > $@

 bind10-messages.html: bind10-messages.xml
-	xsltproc --novalid --xinclude --nonet \
+	@XSLTPROC@ --novalid --xinclude --nonet \
 		--path $(top_builddir)/doc \
 		-o $@ \
 		--stringparam html.stylesheet $(srcdir)/bind10-guide.css \
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = $(man_MANS) b10-auth.xml
 if ENABLE_MAN

 b10-auth.8: b10-auth.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-auth.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-auth.xml

 else

--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST += $(man_MANS) b10-cmdctl.xml cmdctl_messages.mes
 if ENABLE_MAN

 b10-cmdctl.8: b10-cmdctl.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl.xml

 else

--- a/src/bin/dbutil/Makefile.am
+++ b/src/bin/dbutil/Makefile.am
@@ -19,7 +19,7 @@ CLEANFILES += $(man_MANS)
 if ENABLE_MAN

 b10-dbutil.8: b10-dbutil.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-dbutil.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-dbutil.xml

 else

--- a/src/bin/ddns/Makefile.am
+++ b/src/bin/ddns/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST += $(man_MANS) b10-ddns.xml
 if ENABLE_MAN

 b10-ddns.8: b10-ddns.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-ddns.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-ddns.xml

 else

--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = $(man_MANS) b10-dhcp4.xml dhcp4.spec

 if ENABLE_MAN
 b10-dhcp4.8: b10-dhcp4.xml
-	xsltproc --novalid --xinclude --nonet -o $@ \
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
 	$(srcdir)/b10-dhcp4.xml

--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = $(man_MANS) b10-dhcp6.xml dhcp6.spec
 if ENABLE_MAN

 b10-dhcp6.8: b10-dhcp6.xml
-	xsltproc --novalid --xinclude --nonet -o $@ \
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
        $(srcdir)/b10-dhcp6.xml

--- a/src/bin/host/Makefile.am
+++ b/src/bin/host/Makefile.am
@@ -26,7 +26,7 @@ if ENABLE_MAN
 man: b10-host.1

 b10-host.1: b10-host.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-host.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-host.xml

 else

--- a/src/bin/loadzone/Makefile.am
+++ b/src/bin/loadzone/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = $(man_MANS) b10-loadzone.xml
 if ENABLE_MAN

 b10-loadzone.8: b10-loadzone.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-loadzone.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-loadzone.xml

 else

--- a/src/bin/msgq/Makefile.am
+++ b/src/bin/msgq/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = $(man_MANS) msgq.xml
 if ENABLE_MAN

 b10-msgq.8: msgq.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/msgq.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/msgq.xml

 else

--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = $(man_MANS) b10-resolver.xml resolver_messages.mes
 if ENABLE_MAN

 b10-resolver.8: b10-resolver.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-resolver.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-resolver.xml

 else

--- a/src/bin/showtech/Makefile.am
+++ b/src/bin/showtech/Makefile.am
@@ -17,7 +17,7 @@ CLEANFILES += $(man_MANS)
 if ENABLE_MAN

 .xml.1:
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<

 else

--- a/src/bin/sockcreator/Makefile.am
+++ b/src/bin/sockcreator/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) b10-sockcreator.xml
 if ENABLE_MAN

 b10-sockcreator.8: b10-sockcreator.xml
-        xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-sockcreator.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-sockcreator.xml

 else

--- a/src/bin/stats/Makefile.am
+++ b/src/bin/stats/Makefile.am
@@ -29,10 +29,10 @@ EXTRA_DIST += stats_messages.mes stats_httpd_messages.mes
 if ENABLE_MAN

 b10-stats.8: b10-stats.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-stats.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-stats.xml

 b10-stats-httpd.8: b10-stats-httpd.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-stats-httpd.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-stats-httpd.xml

 else

--- a/src/bin/usermgr/Makefile.am
+++ b/src/bin/usermgr/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST = $(man_MANS) b10-cmdctl-usermgr.xml
 if ENABLE_MAN

 b10-cmdctl-usermgr.8: b10-cmdctl-usermgr.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl-usermgr.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cmdctl-usermgr.xml

 else

--- a/src/bin/xfrin/Makefile.am
+++ b/src/bin/xfrin/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST += xfrin.spec xfrin_messages.mes
 if ENABLE_MAN

 b10-xfrin.8: b10-xfrin.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrin.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrin.xml

 else

--- a/src/bin/xfrout/Makefile.am
+++ b/src/bin/xfrout/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = $(man_MANS) b10-xfrout.xml xfrout_messages.mes
 if ENABLE_MAN

 b10-xfrout.8: b10-xfrout.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrout.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-xfrout.xml

 else

--- a/src/bin/zonemgr/Makefile.am
+++ b/src/bin/zonemgr/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = $(man_MANS) b10-zonemgr.xml zonemgr_messages.mes
 if ENABLE_MAN

 b10-zonemgr.8: b10-zonemgr.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-zonemgr.xml
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-zonemgr.xml

 else