[svn] commit: r712 - in /branches/parkinglot/src/bin: auth/Makefile.am bind10/Makefile.am bind10/bind10.py.in

[BIND 10 source code commits]

Author: jreed
Date: Wed Feb  3 17:30:38 2010
New Revision: 712

Log:
If not B10_FROM_SOURCE then pre-pend the libexec directory
for starting programs from bind10.

Have auth installed to pkglibexecdir. (While here add a comment about
pkgdatadir problem.)

Modified:
    branches/parkinglot/src/bin/auth/Makefile.am
    branches/parkinglot/src/bin/bind10/Makefile.am
    branches/parkinglot/src/bin/bind10/bind10.py.in

Modified: branches/parkinglot/src/bin/auth/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/auth/Makefile.am (original)
+++ branches/parkinglot/src/bin/auth/Makefile.am Wed Feb  3 17:30:38 2010
@@ -1,6 +1,8 @@
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
-bin_PROGRAMS = b10-auth
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+
+pkglibexec_PROGRAMS = b10-auth
 b10_auth_SOURCES = auth_srv.cc auth_srv.h
 b10_auth_SOURCES += common.cc common.h
 b10_auth_SOURCES += main.cc
@@ -9,6 +11,8 @@
 b10_auth_LDADD += $(top_builddir)/src/lib/config/cpp/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
 
+# TODO: config.h.in is wrong because doesn't honor pkgdatadir
+# and can't use @datadir@ because doesn't expand default ${prefix}
 b10_authdir = $(DESTDIR)$(pkgdatadir)
 b10_auth_DATA = auth.spec
 

Modified: branches/parkinglot/src/bin/bind10/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/bind10/Makefile.am (original)
+++ branches/parkinglot/src/bin/bind10/Makefile.am Wed Feb  3 17:30:38 2010
@@ -1,5 +1,7 @@
 bin_SCRIPTS = bind10
 CLEANFILES = bind10.py
+
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 bind10dir = $(DESTDIR)$(pkgdatadir)
 bind10_DATA = bob.spec
@@ -7,5 +9,6 @@
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 bind10: bind10.py
-	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" bind10.py >$@
+	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
 	chmod a+x $@

Modified: branches/parkinglot/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/bind10.py.in (original)
+++ branches/parkinglot/src/bin/bind10/bind10.py.in Wed Feb  3 17:30:38 2010
@@ -69,6 +69,8 @@
         spawn_env['PATH'] = os.environ['PATH']
         if 'B10_FROM_SOURCE' in os.environ:
             spawn_env['B10_FROM_SOURCE'] = os.environ['B10_FROM_SOURCE']
+        else: 
+            spawn_env['PATH'] = "@@LIBEXECDIR@@:" + spawn_env['PATH']
         if 'PYTHON_EXEC' in os.environ:
             spawn_env['PYTHON_EXEC'] = os.environ['PYTHON_EXEC']
         if 'PYTHONPATH' in os.environ: