BIND 10 trac1687, updated. 944da84035e466b1b0bdad4703ec0b76cad1e58a [trac1687] reorganize

[BIND 10 source code commits]

The branch, trac1687 has been updated
       via  944da84035e466b1b0bdad4703ec0b76cad1e58a (commit)
       via  682df53277cfb545a1ba34a3a2198cb555cca6f5 (commit)
       via  983db587664d12c7d75e5b01af0c97899c1534e9 (commit)
      from  042efddd3808f82221affe41249159cbeb7efb76 (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 944da84035e466b1b0bdad4703ec0b76cad1e58a
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Feb 29 10:31:42 2012 -0600

    [trac1687] reorganize
    
    be sure clean removes generated docs
    
    fix so works in builddir
    
    get rid of regenarate every time for bind10-messages.
    TODO: need to list all .mes dependencies now since no portable way.

commit 682df53277cfb545a1ba34a3a2198cb555cca6f5
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Feb 29 10:30:10 2012 -0600

    [trac1687] make man page generation on by default
    
    and change help to say how to disable it.
    
    Not sure if want to do this or not. The plan in for
    tarballs to include generated man pages anyways, so maybe this default
    is not needed.

commit 983db587664d12c7d75e5b01af0c97899c1534e9
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Feb 29 10:29:47 2012 -0600

    [trac1687] include system_messages.py in tarball

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am           |    6 +++++-
 configure.ac          |    4 ++--
 doc/guide/Makefile.am |   19 +++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index cc91a56..5c6d0bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,8 +89,12 @@ systest:
 	cd tests/system; \
 	sh $(abs_srcdir)/tests/system/runall.sh
 
+### include tool to generate documentation from log message specifications
+### in the distributed tarball:
+EXTRA_DIST = tools/system_messages.py
+
 #### include external sources in the distributed tarball:
-EXTRA_DIST = ext/asio/README
+EXTRA_DIST += ext/asio/README
 EXTRA_DIST += ext/asio/README
 EXTRA_DIST += ext/asio/asio.hpp
 EXTRA_DIST += ext/asio/asio/basic_socket.hpp
diff --git a/configure.ac b/configure.ac
index de79551..3c9666d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -906,8 +906,8 @@ AC_SUBST(PERL)
 AC_PATH_PROGS(AWK, gawk awk)
 AC_SUBST(AWK)
 
-AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
-  [regenerate man pages [default=no]])], enable_man=$enableval, enable_man=no)
+AC_ARG_ENABLE(man, [AC_HELP_STRING([--disable-man],
+  [don't generate documentation])], enable_man=$enableval, enable_man=yes)
 
 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index ffe89c9..f46f4a9 100644
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -1,12 +1,16 @@
-EXTRA_DIST = bind10-guide.css
-EXTRA_DIST += bind10-guide.xml bind10-guide.html bind10-guide.txt
-EXTRA_DIST += bind10-messages.xml bind10-messages.html
+# generated documentation
+DOCS = bind10-messages.html bind10-guide.html bind10-guide.txt
+
+docdir = $(pkgdatadir)/doc/$(PACKAGE)
+doc_DATA = $(DOCS) bind10-guide.css
+
+# TODO: okay to include the generated bind10-messages.xml in dist tarfile too?
+EXTRA_DIST = bind10-guide.xml bind10-messages.xml $(doc_DATA)
+CLEANFILES = $(DOCS) bind10-messages.xml
 
 # This is not a "man" manual, but reuse this for now for docbook.
 if ENABLE_MAN
 
-.PHONY: bind10-messages.xml
-
 bind10-guide.html: bind10-guide.xml
 	xsltproc --novalid --xinclude --nonet \
 		--path $(top_builddir)/doc \
@@ -20,7 +24,7 @@ bind10-guide.html: bind10-guide.xml
 HTML2TXT = elinks -dump -no-numbering -no-references
 
 bind10-guide.txt: bind10-guide.html
-	$(HTML2TXT) $(srcdir)/bind10-guide.html > $@
+	$(HTML2TXT) bind10-guide.html > $@
 
 bind10-messages.html: bind10-messages.xml
 	xsltproc --novalid --xinclude --nonet \
@@ -28,9 +32,8 @@ bind10-messages.html: bind10-messages.xml
 		-o $@ \
 		--stringparam html.stylesheet $(srcdir)/bind10-guide.css \
 		http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
-		$(srcdir)/bind10-messages.xml
+		bind10-messages.xml
 
-# So many dependencies that it's easiest just to regenerate it every time
 bind10-messages.xml:
 	$(PYTHON) $(top_srcdir)/tools/system_messages.py -o $@ $(top_srcdir)