Since path.normpath("") = ".", avoid doing this, such that EPREFIX

remains empty when it should be, instead of "." which means something
entirely different.

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

diff --git a/configure.in b/configure.in
index a46cad317538d9a181e789271ad059ec16c6756e..9eee618ac6628d124b8f2f2cc7730b8d64eff639 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -199,6 +199,13 @@ AC_HELP_STRING([--with-offset-prefix],
                           [DOMAIN_PREFIX=$withval],
                           [DOMAIN_PREFIX=''])
 
+if test "x$DOMAIN_PREFIX" = "x"
+then
+       PYTHON_EPREFIX='""'
+else
+       PYTHON_EPREFIX='path.normpath("'"$DOMAIN_PREFIX"'")'
+fi
+
 AC_ARG_WITH(eapi,
 AC_HELP_STRING([--with-eapi], [specify what eapi to use (default 1)]),
 [SUPPORTED_EAPI=$withval],
@@ -225,6 +232,7 @@ AC_SUBST(rootuser)
 AC_SUBST(rootuid)
 AC_SUBST(rootgid)
 AC_SUBST(DOMAIN_PREFIX)
+AC_SUBST(PYTHON_EPREFIX)
 AC_SUBST(SUPPORTED_EAPI)
 AC_SUBST(DEFAULT_PATH)
 AC_SUBST(PORTAGE_BASE,['${exec_prefix}/lib/portage'])

diff --git a/pym/portage/const_autotool.py b/pym/portage/const_autotool.py
index a0e633652a775dec1303988d16cb0db643cdbcf6..6362468afdc2e3eeea80df6b6445acf34ab26361 100644 (file)
--- a/pym/portage/const_autotool.py
+++ b/pym/portage/const_autotool.py
@@ -9,7 +9,7 @@ __all__ = ["EPREFIX", "SYSCONFDIR", "DATADIR", "PORTAGE_BASE",
 
 from os import path
 
-EPREFIX=path.normpath("@DOMAIN_PREFIX@")
+EPREFIX=@PYTHON_EPREFIX@
 SYSCONFDIR=path.normpath("@sysconfdir@")
 DATADIR=path.normpath("@datadir@")
 PORTAGE_BASE=path.normpath("@PORTAGE_BASE@")