Cleaned up makedist a bit more.

# Also changed 4.0B3-RC2 to 4.0b3-RC2.  I don't see why we should start
# using capital letters in 4.0.

2 files changed, 25 insertions, 24 deletions

diff --git a/configure.in b/configure.in
index 8fc58b8a37..be665ac636 100644
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ dnl ## Diversion 4 is the last one.  Here we generate files and clean up.
 divert(1)
 
 dnl ## This is where the version number is changed from now on!
-AM_INIT_AUTOMAKE(php, 4.0B3-RC2)
+AM_INIT_AUTOMAKE(php, 4.0b3-RC2)
 
 PHP_VERSION=$VERSION
 echo "/* automatically generated by configure */" > php_version.h.new
diff --git a/makedist b/makedist
index 6c9a393089..cb80934270 100755
--- a/makedist
+++ b/makedist
@@ -55,16 +55,17 @@ MY_OLDPWD=`pwd`
 ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar.gz
 
 # temporary directory used to check out files from CVS
-TMPDIR=$MY_OLDPWD/cvstmp-$PKG-$VER
+DIR=$PKG-$VER
+DIRPATH=$MY_OLDPWD/$DIR
 
-if test -d "$TMPDIR"; then
-    echo "Temporary directory $TMPDIR"
+if test -d "$DIRPATH"; then
+    echo "The directory $DIR"
     echo "already exists, rename or remove it and run makedist again."
     exit 1
 fi
 
 # version part of the CVS release tag
-CVSVER=`echo $VER | sed -e 's/\./_/g'`
+CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
 
 # CVS release tag
 CVSTAG=${PKG}_$CVSVER
@@ -76,17 +77,17 @@ ZENDMOD=`cat libzend/CVS/Repository | sed -e 's!^/[^/]*/!!'`
 # should become "TSRM"
 TSRMMOD=`cat TSRM/CVS/Repository | sed -e 's!^/[^/]*/!!'`
 
-if test ! -d $TMPDIR; then
-    mkdir -p $TMPDIR || exit 2
+if test ! -d $DIRPATH; then
+    mkdir -p $DIRPATH || exit 2
 fi
 
-cd $TMPDIR || exit 3
+#cd $DIRPATH || exit 3
 
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$CVSMOD'...$ECHO_C"
-cvs -Q export -r $CVSTAG $CVSMOD || exit 4
+cvs -Q export -d $DIR -r $CVSTAG $CVSMOD || exit 4
 echo ""
 
-cd $CVSMOD || exit 5
+cd $DIR || exit 5
 
 # Check out Zend
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$ZENDMOD'...$ECHO_C"
@@ -121,26 +122,26 @@ echo "/* Dummy File */" > ext/bcmath/number.c
 echo "/* Dummy File */" > ext/bcmath/number.h
 
 #perl -i -p -e 's/\r\n/\n/' *.dsw *.dsp
-set +x
-
-INC="$INC \
-configuration-scanner.c \
-configuration-parser.c configuration-parser.h \
-acconfig.h aclocal.m4 missing mkinstalldirs \
-ltconfig ltmain.sh config.sub config.guess php_config.h.in \
-configure install-sh Makefile.in"
-
-
-mkdir $PKG-$VER || exit 6
-mv $INC $PKG-$VER || exit 7
+#set +x
+#
+#INC="$INC \
+#configuration-scanner.c \
+#configuration-parser.c configuration-parser.h \
+#acconfig.h aclocal.m4 missing mkinstalldirs \
+#ltconfig ltmain.sh config.sub config.guess php_config.h.in \
+#configure install-sh Makefile.in"
+#
+#
+#mkdir $PKG-$VER || exit 6
+#mv $INC $PKG-$VER || exit 7
  
+cd $MY_OLDPWD
 $ECHO_N "makedist: making gzipped tar archive...$ECHO_C"
 tar czf $ARCHIVE $PKG-$VER || exit 8
 echo ""
 
 $ECHO_N "makedist: cleaning up...$ECHO_C"
-cd $MY_OLDPWD
-rm -rf $TMPDIR || exit 9
+rm -rf $DIRPATH || exit 9
 echo ""
 
 exit 0