From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 27 Oct 2007 20:43:57 +0000 (-0000)
Subject: Since path.normpath("") = ".", avoid doing this, such that EPREFIX
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=eadd7cf1caff09753a6548fbef3d99817de59ba5;p=portage.git

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 a46cad317..9eee618ac 100644
--- 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 a0e633652..6362468af 100644
--- 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@")