BIND 10 trac990, updated. 9f6d580f95c2674864bd1fbc1955b9900d58ffb8 [trac990] Changes after review.

[BIND 10 source code commits]

The branch, trac990 has been updated
       via  9f6d580f95c2674864bd1fbc1955b9900d58ffb8 (commit)
      from  4fb4173e7538a13246af1ae75afa9d783630da55 (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 9f6d580f95c2674864bd1fbc1955b9900d58ffb8
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Tue Jun 28 15:20:20 2011 +0200

    [trac990] Changes after review.

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

Summary of changes:
 src/bin/bind10/run_bind10.sh.in    |    2 +-
 src/bin/dhcp6/Makefile.am          |    8 +++-----
 src/bin/dhcp6/main.cc              |    6 +++---
 src/bin/dhcp6/spec_config.h.pre.in |    2 +-
 src/bin/dhcp6/tests/Makefile.am    |    2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/run_bind10.sh.in b/src/bin/bind10/run_bind10.sh.in
index 89301bd..bd93094 100755
--- a/src/bin/bind10/run_bind10.sh.in
+++ b/src/bin/bind10/run_bind10.sh.in
@@ -20,7 +20,7 @@ export PYTHON_EXEC
 
 BIND10_PATH=@abs_top_builddir@/src/bin/bind10
 
-PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/resolver:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/stats:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:$PATH
+PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/resolver:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/stats:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:@abs_top_builddir@/src/bin/dhcp6:$PATH
 export PATH
 
 PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/log/.libs:@abs_top_builddir@/src/lib/util/io/.libs
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 5b5bc63..8d341cb 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -19,14 +19,12 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 CLEANFILES = *.gcno *.gcda spec_config.h
 
 man_MANS = b10-dhcp6.8
-#EXTRA_DIST = $(man_MANS) b10-auth.xml
-
-if ENABLE_MAN
+EXTRA_DIST = $(man_MANS) dhcp6.spec
 
+#if ENABLE_MAN
 #b10-dhcp6.8: b10-dhcp6.xml
 #	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-dhcp6.xml
-
-endif
+#endif
 
 spec_config.h: spec_config.h.pre
 	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index 044a92f..75af3d9 100644
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -101,7 +101,7 @@ main(int argc, char* argv[]) {
             specfile = string(getenv("B10_FROM_BUILD")) +
                 "/src/bin/auth/dhcp6.spec";
         } else {
-            specfile = string(AUTH_SPECFILE_LOCATION);
+            specfile = string(DHCP6_SPECFILE_LOCATION);
         }
 
         // auth_server = new AuthSrv(cache, xfrout_client);
@@ -114,8 +114,8 @@ main(int argc, char* argv[]) {
     }
 
     while (true) {
-	    sleep(10);
-	    cout << "[b10-dhcp6] I'm alive." << endl;
+            sleep(10);
+            cout << "[b10-dhcp6] I'm alive." << endl;
     }
 
     return (ret);
diff --git a/src/bin/dhcp6/spec_config.h.pre.in b/src/bin/dhcp6/spec_config.h.pre.in
index a06d363..42775b2 100644
--- a/src/bin/dhcp6/spec_config.h.pre.in
+++ b/src/bin/dhcp6/spec_config.h.pre.in
@@ -12,4 +12,4 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#define AUTH_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/dhcp6.spec"
+#define DHCP6_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/dhcp6.spec"
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 65bd3af..a0290c7 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -10,5 +10,5 @@ check-local:
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
 	BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket \
-		$(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
+		$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done