From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 1 Jul 2008 18:47:14 +0000 (-0000)
Subject: it works better if all files are available, and if you reference existing variables
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=902b2587bdfae45f08bf861a718dc83dc5501b16;p=portage.git

it works better if all files are available, and if you reference existing variables

svn path=/main/branches/prefix/; revision=10884
---

diff --git a/acinclude.m4 b/acinclude.m4
index aca8d93f6..e864205a4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -19,14 +19,14 @@ AC_DEFUN([GENTOO_PATH_PYTHON],
   AC_PATH_PROG([PORTAGE_PYTHON], [python], no, $2)
 
   dnl is is there at all?
-  if test "$PYTHON" = "no" ; then
+  if test "$PORTAGE_PYTHON" = "no" ; then
     AC_MSG_ERROR([no python found in your path])
   fi
 
   dnl is it the version we want?
-  ver=`$PYTHON -c 'import sys; print sys.version.split(" ")[[0]]'`
-  AC_MSG_CHECKING([whether $PYTHON $ver >= $1])
-  cmp=`$PYTHON -c 'import sys; print sys.version.split(" ")[[0]] >= "$1"'`
+  ver=`$PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]]'`
+  AC_MSG_CHECKING([whether $PORTAGE_PYTHON $ver >= $1])
+  cmp=`$PORTAGE_PYTHON -c 'import sys; print sys.version.split(" ")[[0]] >= "$1"'`
   if test "$cmp" = "True" ; then
     AC_MSG_RESULT([yes])
   else
diff --git a/tarball.sh b/tarball.sh
index f1d67afff..aa2e02823 100755
--- a/tarball.sh
+++ b/tarball.sh
@@ -26,6 +26,7 @@ rsync -a --exclude='.svn' . ${DEST}
 sed -i -e '/^VERSION=/s/^.*$/VERSION="'${V}-prefix'"/' ${DEST}/pym/portage/__init__.py
 sed -i -e "s/##VERSION##/${V}-prefix/g" ${DEST}/man/emerge.1
 sed -i -e "s/@version@/${V}/" ${DEST}/configure.in
+touch ${DEST}/subst-install.vars.in.in
 
 cd ${DEST}
 find -name '*~' | xargs --no-run-if-empty rm -f