- Update makedist script

1 files changed, 3 insertions, 11 deletions

diff --git a/makedist b/makedist
index 92076470c8..41454d5755 100755
--- a/makedist
+++ b/makedist
@@ -89,22 +89,12 @@ fi
 
 # Export PHP
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$PHPMOD'...$ECHO_C"
-cvs -z 9 -d $PHPROOT -Q export -d $DIR -r $CVSTAG $PHPMOD || exit 4
+cvs -z 9 -d $PHPROOT export -d $DIR -r $CVSTAG $PHPMOD || exit 4
 echo ""
 
 # Export the other modules inside the PHP directory
 cd $DIR || exit 5
 
-# Export Zend
-$ECHO_N "makedist: exporting tag '$CVSTAG' from '$ZENDMOD'...$ECHO_C"
-cvs -z 9 -d $ZENDROOT -Q export -r $CVSTAG $ZENDMOD || exit 4
-echo ""
-
-# Export TSRM
-$ECHO_N "makedist: exporting tag '$CVSTAG' from '$TSRMMOD'...$ECHO_C"
-cvs -z 9 -d $ZENDROOT -Q export -r $CVSTAG $TSRMMOD || exit 4
-echo ""
-
 # remove CVS stuff...
 find . \( \( -name CVS -type d \) -o -name .cvsignore \) -exec rm -rf {} \;
 
@@ -137,11 +127,13 @@ done
 
 cd $MY_OLDPWD
 $ECHO_N "makedist: making gzipped tar archive...$ECHO_C"
+rm -f $ARCHIVEt.tar.gz
 tar cf $ARCHIVE $PKG-$VER || exit 8
 gzip -9 $ARCHIVE || exit 9
 echo ""
 
 $ECHO_N "makedist: making bz2zipped tar archive...$ECHO_C"
+rm -f $ARCHIVEt.tar.bz2
 tar cf $ARCHIVE $PKG-$VER || exit 10
 bzip2 -9 $ARCHIVE || exit 11
 echo ""