X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=1bc4fb9158a01c28bdbbc7e70369eb5e6c8d6c92;hb=c9b2a3dbfc88f3c0eb6039f387064b0d51d5ee58;hp=70994b14d68ad86cc34b0eade62fba9d6e85b7ca;hpb=2d2b7b94d63f3ed4abbdca3ff7a35ef3482c2dea;p=clsql.git

diff --git a/make-upstream.sh b/make-upstream.sh
index 70994b1..1bc4fb9 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -19,6 +19,8 @@ Options:
 EOF
 }
 
+opt_force=0
+
 # Command line
 while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
@@ -54,7 +56,7 @@ if [ ! -z ${opt_tag} ]; then
 
 fi
 
-if [ -z ${opt_force} -a -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
+if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
   echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
   read answer
@@ -74,10 +76,11 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh 
-rm -f test-suite/test.config
+make distclean
+rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh test-suite/test.config
+rm -f 
 rm -f `find . -type f -name .cvsignore`
-rm -rf `find . -type d -name CVS`
+rm -rf `find . -type d -name CVS -or -name .bin`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`