BIND 10 trac1687, updated. 777bf970e37efcbda7222476e67d4ebb2ee7dfca [1687] use @XSLTPROC@ macro instead of xsltproc
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 3 01:06:31 UTC 2012
The branch, trac1687 has been updated
via 777bf970e37efcbda7222476e67d4ebb2ee7dfca (commit)
via 4ed645f5f18fe5a49a4d37a27d84ae1983a628da (commit)
via 83a51075c389a4d913b8f83e9ad0969e8d86f650 (commit)
from b076fa5794d39ffc4fbe3803e7c9870414e04236 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 777bf970e37efcbda7222476e67d4ebb2ee7dfca
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Thu Aug 2 20:06:04 2012 -0500
[1687] use @XSLTPROC@ macro instead of xsltproc
to get the full path if needed
also fixed one target that had spaces instead of tab
commit 4ed645f5f18fe5a49a4d37a27d84ae1983a628da
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Thu Aug 2 17:59:46 2012 -0500
[1687] makefile updates, mostly to generate dummy manpage if not enabled
commit 83a51075c389a4d913b8f83e9ad0969e8d86f650
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Thu Aug 2 17:56:27 2012 -0500
[1687] remove this generated man page
-----------------------------------------------------------------------
Summary of changes:
doc/guide/Makefile.am | 4 +--
src/bin/auth/Makefile.am | 9 +++++-
src/bin/bindctl/Makefile.am | 9 +++++-
src/bin/cfgmgr/Makefile.am | 9 +++++-
src/bin/cmdctl/Makefile.am | 9 +++++-
src/bin/dbutil/Makefile.am | 9 +++++-
src/bin/ddns/Makefile.am | 10 +++++-
src/bin/dhcp4/Makefile.am | 10 +++++-
src/bin/dhcp6/Makefile.am | 10 +++++-
src/bin/host/Makefile.am | 9 +++++-
src/bin/loadzone/Makefile.am | 9 +++++-
src/bin/msgq/Makefile.am | 9 +++++-
src/bin/resolver/Makefile.am | 9 +++++-
src/bin/showtech/Makefile.am | 9 +++++-
src/bin/showtech/b10-showtech.1 | 66 ---------------------------------------
src/bin/sockcreator/Makefile.am | 9 +++++-
src/bin/stats/Makefile.am | 11 +++++--
src/bin/usermgr/Makefile.am | 9 +++++-
src/bin/xfrin/Makefile.am | 9 +++++-
src/bin/xfrout/Makefile.am | 9 +++++-
src/bin/zonemgr/Makefile.am | 9 +++++-
21 files changed, 158 insertions(+), 88 deletions(-)
delete mode 100644 src/bin/showtech/b10-showtech.1
-----------------------------------------------------------------------
diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 94dfeb0..895716d 100644
--- 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 1f0fbbf..eb5b8ef 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -20,12 +20,19 @@ CLEANFILES = *.gcno *.gcda auth.spec spec_config.h
CLEANFILES += auth_messages.h auth_messages.cc
man_MANS = b10-auth.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/bindctl/Makefile.am b/src/bin/bindctl/Makefile.am
index 52a5145..1e41345 100644
--- a/src/bin/bindctl/Makefile.am
+++ b/src/bin/bindctl/Makefile.am
@@ -14,11 +14,18 @@ pythondir = $(pyexecdir)/bindctl
bindctldir = $(pkgdatadir)
CLEANFILES = bindctl bindctl_main.pyc
+CLEANFILES += $(man_MANS)
if ENABLE_MAN
bindctl.1: bindctl.xml
- xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml
+ @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml
+
+else
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/cfgmgr/Makefile.am b/src/bin/cfgmgr/Makefile.am
index aee78cf..99feed5 100644
--- a/src/bin/cfgmgr/Makefile.am
+++ b/src/bin/cfgmgr/Makefile.am
@@ -10,12 +10,19 @@ b10_cfgmgrdir = @localstatedir@/@PACKAGE@
#B10_cfgmgr_DATA =
man_MANS = b10-cfgmgr.8
+CLEANFILES += $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-cfgmgr.xml
if ENABLE_MAN
b10-cfgmgr.8: b10-cfgmgr.xml
- xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cfgmgr.xml
+ @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-cfgmgr.xml
+
+else
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index e302fa6..e6a8d5e 100644
--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -26,12 +26,19 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.pyc
man_MANS = b10-cmdctl.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/dbutil/Makefile.am b/src/bin/dbutil/Makefile.am
index e05055f..c15bdec 100644
--- a/src/bin/dbutil/Makefile.am
+++ b/src/bin/dbutil/Makefile.am
@@ -14,11 +14,18 @@ CLEANFILES = b10-dbutil b10-dbutil.pyc
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyc
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyo
+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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/ddns/Makefile.am b/src/bin/ddns/Makefile.am
index 0b014cb..2f99e81 100644
--- a/src/bin/ddns/Makefile.am
+++ b/src/bin/ddns/Makefile.am
@@ -15,13 +15,21 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/ddns_messages.pyc
EXTRA_DIST = ddns_messages.mes ddns.spec
+
man_MANS = b10-ddns.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index d343633..ad5f461 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -15,13 +15,21 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = spec_config.h
man_MANS = b10-dhcp4.8
+CLEANFILES += $(man_MANS)
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
+
+else
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
+
endif
spec_config.h: spec_config.h.pre
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 16b17ed..43e109d 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -16,14 +16,22 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = spec_config.h
man_MANS = b10-dhcp6.8
+CLEANFILES += $(man_MANS)
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
+
+else
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
+
endif
spec_config.h: spec_config.h.pre
diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am
index a8f96c2..e64ac93 100644
--- a/src/bin/host/Makefile.am
+++ b/src/bin/host/Makefile.am
@@ -17,6 +17,7 @@ b10_host_LDADD += $(top_builddir)/src/lib/util/libutil.la
b10_host_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
man_MANS = b10-host.1
+CLEANFILES += $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-host.xml
.PHONY: man
@@ -25,6 +26,12 @@ 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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/loadzone/Makefile.am b/src/bin/loadzone/Makefile.am
index a235d68..175a67a 100644
--- a/src/bin/loadzone/Makefile.am
+++ b/src/bin/loadzone/Makefile.am
@@ -5,12 +5,19 @@ noinst_SCRIPTS = run_loadzone.sh
CLEANFILES = b10-loadzone
man_MANS = b10-loadzone.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/msgq/Makefile.am b/src/bin/msgq/Makefile.am
index 908cab5..25b0dc7 100644
--- a/src/bin/msgq/Makefile.am
+++ b/src/bin/msgq/Makefile.am
@@ -7,12 +7,19 @@ pkglibexec_SCRIPTS = b10-msgq
CLEANFILES = b10-msgq msgq.pyc
man_MANS = b10-msgq.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 2bb3768..3bb0d3c 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -23,12 +23,19 @@ CLEANFILES += resolver.spec spec_config.h
CLEANFILES += resolver_messages.cc resolver_messages.h
man_MANS = b10-resolver.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/showtech/Makefile.am b/src/bin/showtech/Makefile.am
index cc9923c..8ee078e 100644
--- a/src/bin/showtech/Makefile.am
+++ b/src/bin/showtech/Makefile.am
@@ -12,11 +12,18 @@ MAN1_FILES = \
man_MANS = \
$(MAN1_FILES:.xml=.1)
+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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/showtech/b10-showtech.1 b/src/bin/showtech/b10-showtech.1
deleted file mode 100644
index b331713..0000000
--- a/src/bin/showtech/b10-showtech.1
+++ /dev/null
@@ -1,66 +0,0 @@
-'\" t
-.\" Title: b10-showtech
-.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: June 26, 2012
-.\" Manual: BIND10
-.\" Source: BIND10
-.\" Language: English
-.\"
-.TH "B10\-SHOWTECH" "1" "June 26, 2012" "BIND10" "BIND10"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-b10-showtech \- BIND 10 system information display tool
-.SH "SYNOPSIS"
-.HP \w'\fBb10\-showtech\fR\ 'u
-\fBb10\-showtech\fR
-.SH "DESCRIPTION"
-.PP
-The
-\fBb10\-showtech\fR
-program collects and outputs a variety of information about the system that BIND 10 is running on\&. This information can be useful to people involved in debugging and technical support\&.
-.SH "ARGUMENTS"
-.PP
-\-h
-.RS 4
-Displays usage instructions\&.
-.RE
-.PP
-\-o \fIoutput\-file\fR
-.RS 4
-If an output file is specified, the output of
-\fBb10\-showtech\fR
-is written to this file\&. By default, the output is written to standard output\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBbind10\fR(8),
-BIND 10 Guide\&.
-.SH "HISTORY"
-.PP
-The
-\fBb10\-showtech\fR
-daemon was initially implemented by ISC staff in June, 2012\&.
-.SH "COPYRIGHT"
-.br
-Copyright \(co 2012 Internet Systems Consortium, Inc. ("ISC")
-.br
diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 6ac494f..a57f4aa 100644
--- a/src/bin/sockcreator/Makefile.am
+++ b/src/bin/sockcreator/Makefile.am
@@ -13,12 +13,19 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = *.gcno *.gcda
man_MANS = b10-sockcreator.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/stats/Makefile.am b/src/bin/stats/Makefile.am
index 63e2a3b..88592e6 100644
--- a/src/bin/stats/Makefile.am
+++ b/src/bin/stats/Makefile.am
@@ -20,6 +20,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/stats_httpd_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/stats_httpd_messages.pyc
man_MANS = b10-stats.8 b10-stats-httpd.8
+CLEANFILES += $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-stats.xml b10-stats-httpd.xml
EXTRA_DIST += stats.spec stats-httpd.spec
EXTRA_DIST += stats-httpd-xml.tpl stats-httpd-xsd.tpl stats-httpd-xsl.tpl
@@ -28,10 +29,16 @@ 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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/usermgr/Makefile.am b/src/bin/usermgr/Makefile.am
index 7ebb1cd..68bf3e5 100644
--- a/src/bin/usermgr/Makefile.am
+++ b/src/bin/usermgr/Makefile.am
@@ -5,12 +5,19 @@ b10_cmdctl_usermgrdir = $(pkgdatadir)
CLEANFILES= b10-cmdctl-usermgr
man_MANS = b10-cmdctl-usermgr.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/xfrin/Makefile.am b/src/bin/xfrin/Makefile.am
index 8d80b22..b9434db 100644
--- a/src/bin/xfrin/Makefile.am
+++ b/src/bin/xfrin/Makefile.am
@@ -15,13 +15,20 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrin_messages.pyc
man_MANS = b10-xfrin.8
+CLEANFILES += $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-xfrin.xml
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/xfrout/Makefile.am b/src/bin/xfrout/Makefile.am
index 6100e64..c07f069 100644
--- a/src/bin/xfrout/Makefile.am
+++ b/src/bin/xfrout/Makefile.am
@@ -15,12 +15,19 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/xfrout_messages.pyc
man_MANS = b10-xfrout.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
diff --git a/src/bin/zonemgr/Makefile.am b/src/bin/zonemgr/Makefile.am
index aa427fd..7956326 100644
--- a/src/bin/zonemgr/Makefile.am
+++ b/src/bin/zonemgr/Makefile.am
@@ -15,12 +15,19 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/zonemgr_messages.pyc
man_MANS = b10-zonemgr.8
+CLEANFILES += $(man_MANS)
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
+
+$(man_MANS):
+ @echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it.
+ @echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
endif
More information about the bind10-changes
mailing list