[trac990] Changes after review.

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

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 >$@

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);

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"

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