r2156: *** empty log message ***

[clsql.git] / make-upstream.sh

diff --git a/make-upstream.sh b/make-upstream.sh
index a42794e32b6a32f17eee0533265bced72865435a..1bc4fb9158a01c28bdbbc7e70369eb5e6c8d6c92 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -56,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
@@ -76,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`