Commit 914d7ca0 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

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

git-svn-id: svn:// e5f2f494-b856-4b98-b285-d166d9295462
parent 5fad17f5
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.h
b10_auth_SOURCES += common.h
b10_auth_SOURCES +=
......@@ -9,6 +11,8 @@ b10_auth_LDADD += $(top_builddir)/src/lib/auth/cpp/.libs/libauth.a
b10_auth_LDADD += $(top_builddir)/src/lib/config/cpp/libcfgclient.a
b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
# TODO: 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
bin_SCRIPTS = bind10
pkglibexecdir = $(libexecdir)/@PACKAGE@
bind10dir = $(DESTDIR)$(pkgdatadir)
bind10_DATA = bob.spec
# TODO: does this need $$(DESTDIR) also?
# this is done here since AC_OUTPUT doesn't expand exec_prefix
$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" >$@
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
-e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" >$@
chmod a+x $@
......@@ -69,6 +69,8 @@ class ProcessInfo:
spawn_env['PATH'] = os.environ['PATH']
if 'B10_FROM_SOURCE' in os.environ:
spawn_env['B10_FROM_SOURCE'] = os.environ['B10_FROM_SOURCE']
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:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment