more eprefix cleanup.

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

diff --git a/bin/etc-update b/bin/etc-update
index 26fd026d1d5acd19cddac60d5cdc5eb2aab495d0..3f214b8ee744c81322d45d11917035d123ff4d39 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -12,7 +12,7 @@
 
 export PORTAGE_CALLER="etc-update"
 
-eval $(python -c 'import portage_const;print "export PREFIX="+portage_const.EPREFIX;print "export PORTAGE_BIN_PATH="+portage_const.PORTAGE_BIN_PATH;')
+eval $(python -c 'import portage_const;print "export EPREFIX="+portage_const.EPREFIX;print "export PORTAGE_BIN_PATH="+portage_const.PORTAGE_BIN_PATH;')
 
 if type -p gsed >/dev/null ; then
        function sed() { gsed "$@"; }

diff --git a/pym/portage.py b/pym/portage.py
index 679852c06e94bba3ce2101ca034c04a530179740..57ceebdfb21edfe24e75165d4471988ed84ab887 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -661,7 +661,7 @@ def env_update(makelinks=1):
        cenvnotice += "# GO INTO "+portage_const.EPREFIX+"/etc/csh.cshrc NOT "+portage_const.EPREFIX+"/etc/csh.env\n\n"
 
        #create /etc/profile.env for bash support
-       outfile = atomic_ofstream(os.path.join(root, portage_const.EPREFIX, "etc", "profile.env"))
+       outfile = atomic_ofstream(os.path.join(root+portage_const.EPREFIX, "etc", "profile.env"))
        outfile.write(penvnotice)
 
        for path in specials.keys():
@@ -685,7 +685,7 @@ def env_update(makelinks=1):
        outfile.close()
 
        #create /etc/csh.env for (t)csh support
-       outfile = atomic_ofstream(os.path.join(root, portage_const.EPREFIX, "etc", "csh.env"))
+       outfile = atomic_ofstream(os.path.join(root+portage_const.EPREFIX, "etc", "csh.env"))
        outfile.write(cenvnotice)
 
        for path in specials.keys():
@@ -2426,7 +2426,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, t
        mysettings["PN"] = mysplit[0]
        mysettings["PV"] = mysplit[1]
        mysettings["PR"] = mysplit[2]
-       mysettings["PREFIX"] = portage_const.EPREFIX
+       mysettings["EPREFIX"] = portage_const.EPREFIX
        if portage_util.noiselimit < 0:
                mysettings["PORTAGE_QUIET"] = "1"