cleanup, set proper version

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

diff --git a/configure.in b/configure.in
index c7780c4af73a431c369bb72addcb5be1fc17f2d9..6ea9037e5078284aabb7f51f9f238543b86f0981 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(portage, 2.1.20, grobian@gentoo.org, portage-prefix)
+AC_INIT(portage-prefix, @version@, grobian@gentoo.org)
 
 AC_PREREQ([2.61])
 

diff --git a/tarball.sh b/tarball.sh
index c87d5e33ede9c6fb1fa47eb12059bdb53711b90e..c1d0799652ce61fe489509ea82ea3f90fbd109bf 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -13,7 +13,6 @@ export PKG="prefix-portage"
 export TMP="/var/tmp"
 export V="$1"
 export DEST="${TMP}/${PKG}-${V}"
-#export PREVEB="2.0.49_pre2"
 
 ./tabcheck.py `grep "#\!@PYTHON@" bin/* | cut -d: -f1` `find ./ -type f -name '*.py'`
 
@@ -25,16 +24,13 @@ fi
 install -d -m0755 ${DEST}
 rsync -a --exclude='.svn' . ${DEST}
 sed -i -e '/^VERSION=/s/^.*$/VERSION="'${V}-prefix'"/' ${DEST}/pym/portage/__init__.py
-sed -i -e "s/##VERSION##/${V}/g" ${DEST}/man/emerge.1
-#rm ${DEST}/man/*.eclass.5
-
-#sed -i -e "s:\t:  :g" ${DEST}/ChangeLog
+sed -i -e "s/##VERSION##/${V}-prefix/g" ${DEST}/man/emerge.1
+sed -i -e "s/@version@/${V}/" ${DEST}/configure.in
 
 cd ${DEST}
 find -name '*~' | xargs --no-run-if-empty rm -f
 find -name '*.pyc' | xargs --no-run-if-empty rm -f
 find -name '*.pyo' | xargs --no-run-if-empty rm -f
-#chown -R root:0 ${DEST}
 cd $TMP
 rm -f ${PKG}-${V}/bin/emerge.py ${PKG}-${V}/bin/{pmake,sandbox} ${PKG}-${V}/{bin,pym}/'.#'* ${PKG}-${V}/{bin,pym}/*.{orig,diff} ${PKG}-${V}/{bin,pym}/*.py[oc]
 cd $TMP/${PKG}-${V}