From 932ddbdd34e4a84fdddff9dacb575ec87e72e17c Mon Sep 17 00:00:00 2001 From: "Jeremy C. Reed" Date: Thu, 2 Aug 2012 20:55:20 -0500 Subject: [PATCH] [1687] rename configure's --enable-man to --enable-generate-docs --- configure.ac | 14 +++++++------- doc/guide/Makefile.am | 6 +++--- src/bin/auth/Makefile.am | 6 +++--- src/bin/bind10/Makefile.am | 8 ++++---- src/bin/bindctl/Makefile.am | 6 +++--- src/bin/cfgmgr/Makefile.am | 6 +++--- src/bin/cmdctl/Makefile.am | 6 +++--- src/bin/dbutil/Makefile.am | 6 +++--- src/bin/ddns/Makefile.am | 6 +++--- src/bin/dhcp4/Makefile.am | 6 +++--- src/bin/dhcp6/Makefile.am | 6 +++--- src/bin/host/Makefile.am | 6 +++--- src/bin/loadzone/Makefile.am | 6 +++--- src/bin/msgq/Makefile.am | 6 +++--- src/bin/resolver/Makefile.am | 6 +++--- src/bin/showtech/Makefile.am | 6 +++--- src/bin/sockcreator/Makefile.am | 6 +++--- src/bin/stats/Makefile.am | 6 +++--- src/bin/usermgr/Makefile.am | 6 +++--- src/bin/xfrin/Makefile.am | 6 +++--- src/bin/xfrout/Makefile.am | 6 +++--- src/bin/zonemgr/Makefile.am | 6 +++--- 22 files changed, 71 insertions(+), 71 deletions(-) diff --git a/configure.ac b/configure.ac index 6b3824f1b3..ba2958223e 100644 --- a/configure.ac +++ b/configure.ac @@ -1016,15 +1016,15 @@ AC_SUBST(PERL) AC_PATH_PROGS(AWK, gawk awk) AC_SUBST(AWK) -AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man], - [regenerate man pages using Docbook [default=no]])], - enable_man=$enableval, enable_man=no) +AC_ARG_ENABLE(generate_docs, [AC_HELP_STRING([--enable-generate-docs], + [regenerate documentation using Docbook [default=no]])], + enable_generate_docs=$enableval, enable_generate_docs=no) # Check for xsltproc -if test "x$enable_man" != xno ; then +if test "x$enable_generate_docs" != xno ; then AC_PATH_PROG([XSLTPROC], [xsltproc]) if test -z "$XSLTPROC"; then - AC_MSG_ERROR("xsltproc not found; it is required for --enable-man") + AC_MSG_ERROR("xsltproc not found; it is required for --enable-generate-docs") else AC_MSG_CHECKING([if $XSLTPROC works]) # run xsltproc to see if works @@ -1041,7 +1041,7 @@ if test "x$enable_man" != xno ; then fi -AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) +AM_CONDITIONAL(GENERATE_DOCS, test x$enable_generate_docs != xno) AC_ARG_ENABLE(install-configurations, [AC_HELP_STRING([--disable-install-configurations], @@ -1385,7 +1385,7 @@ Developer: C++ Code Coverage: $USE_LCOV Python Code Coverage: $USE_PYCOVERAGE Logger checks: $enable_logger_checks - Generate Manuals: $enable_man + Generate Documentation: $enable_generate_docs END diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am index 79d5d33ba8..36b12bc107 100644 --- a/doc/guide/Makefile.am +++ b/doc/guide/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = bind10-guide.xml CLEANFILES = $(HTMLDOCS) $(DOCS) bind10-messages.xml # This is not a "man" manual, but reuse this for now for docbook. -if ENABLE_MAN +if GENERATE_DOCS bind10-guide.html: bind10-guide.xml @XSLTPROC@ --novalid --xinclude --nonet \ @@ -40,7 +40,7 @@ bind10-messages.xml: else $(HTMLDOCS) $(DOCS): - @echo Doc generation disabled. Creating dummy $@. Configure with --enable-man to enable it. - @echo Doc generation disabled. Remove this file, configure with --enable-man, and rebuild BIND 10 > $@ + @echo Doc generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Doc generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am index eb5b8efe48..5f2b3e6634 100644 --- a/src/bin/auth/Makefile.am +++ b/src/bin/auth/Makefile.am @@ -23,7 +23,7 @@ man_MANS = b10-auth.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-auth.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -31,8 +31,8 @@ b10-auth.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/bind10/Makefile.am b/src/bin/bind10/Makefile.am index 68940c9dab..10f9918016 100644 --- a/src/bin/bind10/Makefile.am +++ b/src/bin/bind10/Makefile.am @@ -20,7 +20,7 @@ man_MANS = bind10.8 CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) bind10.xml bind10_messages.mes -if ENABLE_MAN +if GENERATE_DOCS bind10.8: bind10.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml @@ -31,11 +31,11 @@ bind10.8: bind10.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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ #dist-local-check-mans-enabled: -# @echo "*** --enable-man must be used in order to make dist" +# @echo "*** --enable-generate-docs must be used in order to make dist" # @false endif diff --git a/src/bin/bindctl/Makefile.am b/src/bin/bindctl/Makefile.am index 1e41345a30..a4c6dddadd 100644 --- a/src/bin/bindctl/Makefile.am +++ b/src/bin/bindctl/Makefile.am @@ -16,7 +16,7 @@ bindctldir = $(pkgdatadir) CLEANFILES = bindctl bindctl_main.pyc CLEANFILES += $(man_MANS) -if ENABLE_MAN +if GENERATE_DOCS bindctl.1: bindctl.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bindctl.xml @@ -24,8 +24,8 @@ bindctl.1: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/cfgmgr/Makefile.am b/src/bin/cfgmgr/Makefile.am index 99feed564e..4c511ee97a 100644 --- a/src/bin/cfgmgr/Makefile.am +++ b/src/bin/cfgmgr/Makefile.am @@ -13,7 +13,7 @@ man_MANS = b10-cfgmgr.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-cfgmgr.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -21,8 +21,8 @@ b10-cfgmgr.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am index e6a8d5eeb5..7b2c21e70b 100644 --- a/src/bin/cmdctl/Makefile.am +++ b/src/bin/cmdctl/Makefile.am @@ -29,7 +29,7 @@ man_MANS = b10-cmdctl.8 CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) b10-cmdctl.xml cmdctl_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -37,8 +37,8 @@ b10-cmdctl.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/dbutil/Makefile.am b/src/bin/dbutil/Makefile.am index c15bdecb97..701ee799f3 100644 --- a/src/bin/dbutil/Makefile.am +++ b/src/bin/dbutil/Makefile.am @@ -16,7 +16,7 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyc CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/dbutil_messages.pyo CLEANFILES += $(man_MANS) -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -24,8 +24,8 @@ b10-dbutil.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/ddns/Makefile.am b/src/bin/ddns/Makefile.am index 2f99e81af3..c9570bd7cf 100644 --- a/src/bin/ddns/Makefile.am +++ b/src/bin/ddns/Makefile.am @@ -20,7 +20,7 @@ man_MANS = b10-ddns.8 CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) b10-ddns.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -28,8 +28,8 @@ b10-ddns.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index ad5f461445..f5f94c84c7 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -18,7 +18,7 @@ man_MANS = b10-dhcp4.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-dhcp4.xml dhcp4.spec -if ENABLE_MAN +if GENERATE_DOCS b10-dhcp4.8: b10-dhcp4.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ @@ -27,8 +27,8 @@ b10-dhcp4.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index 43e109d621..433218c51d 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -19,7 +19,7 @@ man_MANS = b10-dhcp6.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-dhcp6.xml dhcp6.spec -if ENABLE_MAN +if GENERATE_DOCS b10-dhcp6.8: b10-dhcp6.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ \ @@ -29,8 +29,8 @@ b10-dhcp6.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/host/Makefile.am b/src/bin/host/Makefile.am index e64ac933eb..6d1bd04c15 100644 --- a/src/bin/host/Makefile.am +++ b/src/bin/host/Makefile.am @@ -21,7 +21,7 @@ CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-host.xml .PHONY: man -if ENABLE_MAN +if GENERATE_DOCS man: b10-host.1 @@ -31,7 +31,7 @@ b10-host.1: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/loadzone/Makefile.am b/src/bin/loadzone/Makefile.am index 175a67a10e..74bd1df1d6 100644 --- a/src/bin/loadzone/Makefile.am +++ b/src/bin/loadzone/Makefile.am @@ -8,7 +8,7 @@ man_MANS = b10-loadzone.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-loadzone.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -16,8 +16,8 @@ b10-loadzone.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/msgq/Makefile.am b/src/bin/msgq/Makefile.am index 25b0dc7b90..ef297e18c6 100644 --- a/src/bin/msgq/Makefile.am +++ b/src/bin/msgq/Makefile.am @@ -10,7 +10,7 @@ man_MANS = b10-msgq.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) msgq.xml -if ENABLE_MAN +if GENERATE_DOCS b10-msgq.8: msgq.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/msgq.xml @@ -18,8 +18,8 @@ b10-msgq.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am index 3bb0d3c030..9d65418483 100644 --- a/src/bin/resolver/Makefile.am +++ b/src/bin/resolver/Makefile.am @@ -26,7 +26,7 @@ man_MANS = b10-resolver.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-resolver.xml resolver_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -34,8 +34,8 @@ b10-resolver.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/showtech/Makefile.am b/src/bin/showtech/Makefile.am index 8ee078e903..a9fb6a5f8d 100644 --- a/src/bin/showtech/Makefile.am +++ b/src/bin/showtech/Makefile.am @@ -14,7 +14,7 @@ man_MANS = \ $(MAN1_FILES:.xml=.1) CLEANFILES += $(man_MANS) -if ENABLE_MAN +if GENERATE_DOCS .xml.1: @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< @@ -22,8 +22,8 @@ if ENABLE_MAN 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am index a57f4aa814..3b0b15321e 100644 --- a/src/bin/sockcreator/Makefile.am +++ b/src/bin/sockcreator/Makefile.am @@ -16,7 +16,7 @@ man_MANS = b10-sockcreator.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-sockcreator.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -24,8 +24,8 @@ b10-sockcreator.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/stats/Makefile.am b/src/bin/stats/Makefile.am index 88592e6b02..c4acfc8762 100644 --- a/src/bin/stats/Makefile.am +++ b/src/bin/stats/Makefile.am @@ -26,7 +26,7 @@ EXTRA_DIST += stats.spec stats-httpd.spec EXTRA_DIST += stats-httpd-xml.tpl stats-httpd-xsd.tpl stats-httpd-xsl.tpl EXTRA_DIST += stats_messages.mes stats_httpd_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -37,8 +37,8 @@ b10-stats-httpd.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/usermgr/Makefile.am b/src/bin/usermgr/Makefile.am index 68bf3e596e..9d7a7c527c 100644 --- a/src/bin/usermgr/Makefile.am +++ b/src/bin/usermgr/Makefile.am @@ -8,7 +8,7 @@ man_MANS = b10-cmdctl-usermgr.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-cmdctl-usermgr.xml -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -16,8 +16,8 @@ b10-cmdctl-usermgr.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/xfrin/Makefile.am b/src/bin/xfrin/Makefile.am index b9434db46a..eb2d0b9c1d 100644 --- a/src/bin/xfrin/Makefile.am +++ b/src/bin/xfrin/Makefile.am @@ -19,7 +19,7 @@ CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-xfrin.xml EXTRA_DIST += xfrin.spec xfrin_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -27,8 +27,8 @@ b10-xfrin.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/xfrout/Makefile.am b/src/bin/xfrout/Makefile.am index c07f0693c6..9f8009e29c 100644 --- a/src/bin/xfrout/Makefile.am +++ b/src/bin/xfrout/Makefile.am @@ -18,7 +18,7 @@ man_MANS = b10-xfrout.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-xfrout.xml xfrout_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -26,8 +26,8 @@ b10-xfrout.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif diff --git a/src/bin/zonemgr/Makefile.am b/src/bin/zonemgr/Makefile.am index 7956326d49..9fbdaeb8f2 100644 --- a/src/bin/zonemgr/Makefile.am +++ b/src/bin/zonemgr/Makefile.am @@ -18,7 +18,7 @@ man_MANS = b10-zonemgr.8 CLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) b10-zonemgr.xml zonemgr_messages.mes -if ENABLE_MAN +if GENERATE_DOCS 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 @@ -26,8 +26,8 @@ b10-zonemgr.8: 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 > $@ + @echo Man generation disabled. Creating dummy $@. Configure with --enable-generate-docs to enable it. + @echo Man generation disabled. Remove this file, configure with --enable-generate-docs, and rebuild BIND 10 > $@ endif