Use latest/default autotools, unset possibly unused variable

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

diff --git a/autogen.sh b/autogen.sh
index 137425d818db7da1280aa2fc584eccca16616211..cceaba982d0dd0e10255ccba852a4772ff234ac5 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,12 +6,12 @@ die() {
 }
 
 #autoheader || { echo "failed autoheader"; exit 1; };
-aclocal-1.8 || die "failed aclocal"
+aclocal || die "failed aclocal"
 [ "`type -t glibtoolize`" == "file" ] && alias libtoolize=glibtoolize
 libtoolize --automake -c -f || die "failed libtoolize"
 autoconf || die "failed autoconf"
 touch ChangeLog 
-automake-1.8 -a -c || die "failed automake"
+automake -a -c || die "failed automake"
 
 if [ -x ./test.sh ] ; then
        exec ./test.sh "$@"

diff --git a/tarball.sh b/tarball.sh
index 4159133248b94fa503dd2436fb0c9aeaae9a4b3b..c66a404fe7bf3cadbc21d68a4270d3f33a210387 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -13,7 +13,7 @@ export PKG="prefix-portage"
 export TMP="/var/tmp"
 export V="$1"
 export DEST="${TMP}/${PKG}-${V}"
-export PREVEB="2.0.49_pre2"
+#export PREVEB="2.0.49_pre2"
 
 ./tabcheck.py bin/emerge `find ./ -type f -name '*.py'`