add --with-default-path to configure, appends additional paths

svn path=/main/branches/prefix/; revision=3050

diff --git a/cnf/Makefile.in b/cnf/Makefile.in
index 2dc43185083f24f8945bb7c07c0bfb4874ad4c5d..34916467312a5fab83f4d051f20b7479719294b5 100644 (file)
--- a/cnf/Makefile.in
+++ b/cnf/Makefile.in
@@ -1,4 +1,5 @@
 sysconfdir = @sysconfdir@
+DEFAULT_PATH = @DEFAULT_PATH@
 ARCH = @ARCH@
 
 srcdir=@srcdir@

diff --git a/cnf/make.globals b/cnf/make.globals
index 91dfb121cf4a37bf9a8ca84547760d43040bac73..a672d03a2dc3f13e81bc20bc969f708262228df8 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -72,7 +72,7 @@ PORTAGE_INST_USER="@rootuser@"
 PORTAGE_INST_GID="@wheelgid@"
 
 # Default PATH for ebuild env
-DEFAULT_PATH="@DOMAIN_PREFIX@/sbin:@DOMAIN_PREFIX@/usr/sbin:@DOMAIN_PREFIX@/bin:@DOMAIN_PREFIX@/usr/bin:@PORTAGE_BASE@/bin"
+DEFAULT_PATH="@DEFAULT_PATH@"
 
 # Mode bits for ${WORKDIR} (see ebuild.5).
 PORTAGE_WORKDIR_MODE="0700"

diff --git a/configure.in b/configure.in
index 5bf1360f6f63b389a1085cfcbad9f8b65b7c9634..82ef823de26fdc363d87d5e519d514f27210eb82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -200,6 +200,13 @@ AC_HELP_STRING([--with-offset-prefix], [specify the installation prefix for all
 [DOMAIN_PREFIX=$withval],
 [DOMAIN_PREFIX='/'])
 
+DEFAULT_PATH="${DOMAIN_PREFIX}/usr/bin:${DOMAIN_PREFIX}/usr/sbin:${DOMAIN_PREFIX}/bin:${DOMAIN_PREFIX}/sbin:${prefix}/bin"
+AC_ARG_WITH(default-path, 
+AC_HELP_STRING([--with-default-path], [specify additional PATHs available to the portage build environment ]),
+[DEFAULT_PATH="${DEFAULT_PATH}":$withval],
+[DEFAULT_PATH="${DEFAULT_PATH}"])
+
+
 if test x$enable_missingos = xauto
 then
   pyver=[`python -c 'import sys;print sys.version[0:3]';`]
@@ -241,6 +248,7 @@ AC_SUBST(wheelgid)
 AC_SUBST(rootuser)
 AC_SUBST(rootuid)
 AC_SUBST(DOMAIN_PREFIX)
+AC_SUBST(DEFAULT_PATH)
 AC_SUBST(ARCH)
 AC_SUBST(PORTAGE_BASE,['${libdir}/portage'])
 AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue)