Fix makerelease.sh

diff --git a/scripts/makerelease.sh b/scripts/makerelease.sh
index ad5a33daf527a7e4738533f83fdc09e989697e97..106dd8838d3e3054351a1f40c2fa51e2e299b22b 100755 (executable)
--- a/scripts/makerelease.sh
+++ b/scripts/makerelease.sh
@@ -23,15 +23,9 @@ if [ "x$1" = "x" ]; then
        echo "usage: $0 releasename [--automatic]"
        exit
 else
-       PROGRAM=`pwd | sed "s:/scripts::" | awk -F/ '{print $NF}'`
        RELEASENAME="$1"
 fi
 
-if [[ $1 != $PROGRAM* ]]; then
-       echo "example: $0 $PROGRAM-1.2.3"
-       exit
-fi
-
 if [ "x$2" = "x--automatic" ]; then
        AUTOMATIC="yes"
 fi
@@ -49,7 +43,10 @@ echo "Making release named $RELEASENAME (tip $TIP)"
 
 echo
 echo "Building root: $RELEASENAME/"
-git archive $RELEASENAME
+cd ..
+git archive --format=tar --prefix=$RELEASENAME/ HEAD | gzip >scripts/$RELEASENAME-working.tar.gz
+cd $WRKDIR
+tar -xzvf $RELEASENAME-working.tar.gz
 cd $RELEASENAME
 sh autogen.sh
 rm -rf autogen.sh autom4te.cache
@@ -63,10 +60,12 @@ fi
 cd ..
 
 echo "Building $RELEASENAME.tgz from $RELEASENAME/"
-tar zcf $RELEASENAME.tgz $RELEASENAME/
+tar zcf $RELEASENAME.tar.gz $RELEASENAME/
 
 echo "Building $RELEASENAME.tbz2 from $RELEASENAME/"
-tar jcf $RELEASENAME.tbz2 $RELEASENAME/
+tar jcf $RELEASENAME.tar.bz2 $RELEASENAME/
+
+rm $RELEASENAME-working.tar.gz
 
 PUBLISH="yes"