[1687] use @XSLTPROC@ macro instead of xsltproc

to get the full path if needed

also fixed one target that had spaces instead of tab

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 94dfeb04040753225e8f67d8ec4825192ba3a8f3..895716d87d714f1e8c68014780c3d74f1e26ab7a 100644 (file)
--- 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 \

diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 9a6183f7e635f52e9ee17d4e6080469c30199330..eb5b8efe487732973cf737cc4a0a1b5ac3893ac3 100644 (file)
--- 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
 

diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index e115366587a741bc2177e7702d4c0bf529ab5288..e6a8d5eeb53ba1a357db0ee0cd399aad313fd4fd 100644 (file)
--- 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
 

diff --git a/src/bin/dbutil/Makefile.am b/src/bin/dbutil/Makefile.am
index 0d1b3666f5a6e47c49707de2c265c1eadff5e7a6..c15bdecb97a294bafe48115012bbe99911f6aa56 100644 (file)
--- 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
 

diff --git a/src/bin/ddns/Makefile.am b/src/bin/ddns/Makefile.am
index fa2a2ce2f1ec6fac3466998ac13a3228a35a4a17..2f99e81af354a9340ce3aacb77e965e9c2655cfa 100644 (file)
--- 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
 

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 5afffcab303b34f6ed4f9327496cfa53883f212a..ad5f4614454d08c10b7b2eec683bf811bed2b2ae 100644 (file)
--- 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
 

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 8cd76196ff437c9cd7aff7913a443d599a9b5823..43e109d621e233856f682460b06253b1099be35c 100644 (file)
--- 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
 

diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am
index d9ee9a7e08771e2ebda75cb33c18c1824fc3b4b7..e64ac933eb6101871bb3ced255439807eeee058f 100644 (file)
--- 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
 

diff --git a/src/bin/loadzone/Makefile.am b/src/bin/loadzone/Makefile.am
index 9478b208d51a4eb430874baedbbb13976fba2056..175a67a10eabd376d6378207695eea6102b0a492 100644 (file)
--- 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
 

diff --git a/src/bin/msgq/Makefile.am b/src/bin/msgq/Makefile.am
index 6b137ba61f6f89ec9ebb30cc9ace8a96043a669a..25b0dc7b9092dd2139846581753dc0e44978080a 100644 (file)
--- 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
 

diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index ace01ea48a57f6bb5dc873f5ea52403d1f2d374d..3bb0d3c030b1ff5a90f50f7732a3dc28779977a0 100644 (file)
--- 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
 

diff --git a/src/bin/showtech/Makefile.am b/src/bin/showtech/Makefile.am
index ae8118dab9814c9c2add0d87779184b061f85c4f..8ee078e903dd0b324e82276aebd4711fb5d8218d 100644 (file)
--- 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
 

diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 72094f9555a1f108ce0e75122010deb69589a99b..a57f4aa8142d32bf5384129400865cfb86799488 100644 (file)
--- 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
 

diff --git a/src/bin/stats/Makefile.am b/src/bin/stats/Makefile.am
index 60410a69a2daa541e88d1de9f61a741e4fe33a91..88592e6b02e169fae7f1730b1ea13e0b083f2170 100644 (file)
--- 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
 

diff --git a/src/bin/usermgr/Makefile.am b/src/bin/usermgr/Makefile.am
index 5f427ace841a8e6f581404786dafbc48ae602f67..68bf3e596e76eb03189eb75da6ee500811b134a5 100644 (file)
--- 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
 

diff --git a/src/bin/xfrin/Makefile.am b/src/bin/xfrin/Makefile.am
index 091be9bcdb8a77d8e630316f09733444fc693d0f..b9434db46a024ac9ddcb8626bf48d9ceaf6143eb 100644 (file)
--- 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
 

diff --git a/src/bin/xfrout/Makefile.am b/src/bin/xfrout/Makefile.am
index 8adec7f73f3751fa7e10c51d12413d3b2907cf55..c07f0693c6dda5e06e28b088da77f811184d5d3a 100644 (file)
--- 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
 

diff --git a/src/bin/zonemgr/Makefile.am b/src/bin/zonemgr/Makefile.am
index 8244fb6dc961559a64fac4cac105b181b16adc8f..7956326d49e1b42369a0221849e6284efa03beff 100644 (file)
--- 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