Oki doki

diff --git a/buildconf b/buildconf
index 77b59e4ef1bcf4a9d4c12c9878c9773e2a211a4f..743c7c0d06e6d9f94792908c713a372bc48dd2d0 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -16,7 +16,7 @@ fi
 
 autoheader
 
-automake --add-missing --include-deps -copy
+automake --add-missing --include-deps --copy
 
 mv configure configure.old 2>/dev/null
 autoconf

diff --git a/makedist b/makedist
index 96e6b8957393d7acfe9743f87c8c4b086bd0bd89..198742abf26a34433c388024d6a5da70d4b34465 100755 (executable)
--- a/makedist
+++ b/makedist
@@ -49,13 +49,13 @@ fi
 PKG=$1 ; shift
 VER=$1 ; shift
 
-OLDPWD=`pwd`
+MY_OLDPWD=`pwd`
 
 # the destination .tar.gz file
-ARCHIVE=$OLDPWD/$PKG-$VER.tar.gz
+ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar.gz
 
 # temporary directory used to check out files from CVS
-TMPDIR=$OLDPWD/cvstmp-$PKG-$VER
+TMPDIR=$MY_OLDPWD/cvstmp-$PKG-$VER
 
 # version part of the CVS release tag
 CVSVER=`echo $VER | sed -e 's/\./_/g'`
@@ -70,7 +70,6 @@ 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
 fi
@@ -86,11 +85,12 @@ cd $CVSMOD || exit 5
 # Check out Zend
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$ZENDMOD'...$ECHO_C"
 cvs -d $ZENDROOT -Q export -r $CVSTAG $ZENDMOD || exit 4
+echo ""
 
 # Check out TSRM
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$TSRMMOD'...$ECHO_C"
 cvs -d $ZENDROOT -Q export -r $CVSTAG $TSRMMOD || exit 4
-
+echo ""
 
 INC=""
 
@@ -109,10 +109,10 @@ done
 set -x
 ./buildconf
 cd libzend
-bison -p zend -v -d zend-parser.y -o zend-parser.c
+bison -p zend -d zend-parser.y -o zend-parser.c
 flex -Pzend -ozend-scanner.c -i zend-scanner.l
 cd ..
-bison -p cfg -v -d configuration-parser.y -o configuration-parser.c
+bison -p cfg -d configuration-parser.y -o configuration-parser.c
 flex -Pcfg -oconfiguration-scanner.c -i configuration-scanner.l
 
 #perl -i -p -e 's/\r\n/\n/' *.dsw *.dsp
@@ -121,8 +121,10 @@ set +x
 INC="$INC \
 configuration-scanner.c \
 configuration-parser.c configuration-parser.h \
+acconfig.h aclocal.m4 configure.in missing mkinstalldirs php_config.h.in \
 configure"
 
+
 mkdir $PKG-$VER || exit 6
 mv $INC $PKG-$VER || exit 7
  
@@ -131,7 +133,7 @@ tar czf $ARCHIVE $PKG-$VER || exit 8
 echo ""
 
 $ECHO_N "makedist: cleaning up...$ECHO_C"
-cd $OLDPWD
+cd $MY_OLDPWD
 rm -rf $TMPDIR || exit 9
 echo ""