[gentoo-commits] portage r10884 - main/branches/prefix

[Fabian Groffen (grobian)]

Author: grobian
Date: 2008-07-01 18:47:14 +0000 (Tue, 01 Jul 2008)
New Revision: 10884

Modified:
   main/branches/prefix/acinclude.m4
   main/branches/prefix/tarball.sh
Log:
it works better if all files are available, and if you reference existing variables

Modified: main/branches/prefix/acinclude.m4
===================================================================
--- main/branches/prefix/acinclude.m4	2008-07-01 18:39:57 UTC (rev 10883)
+++ main/branches/prefix/acinclude.m4	2008-07-01 18:47:14 UTC (rev 10884)
@@ -19,14 +19,14 @@
   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

Modified: main/branches/prefix/tarball.sh
===================================================================
--- main/branches/prefix/tarball.sh	2008-07-01 18:39:57 UTC (rev 10883)
+++ main/branches/prefix/tarball.sh	2008-07-01 18:47:14 UTC (rev 10884)
@@ -26,6 +26,7 @@
 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

-- 
gentoo-commits@l.g.o mailing list