r2178: *** empty log message ***

[ctsim.git] / make-upstream.sh

diff --git a/make-upstream.sh b/make-upstream.sh
index edf3051474ce27c28c42dc0cdda7ba4515955475..d39aa595e29d4d76132c80f70ca73585e8aba343 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -40,18 +40,6 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
-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
-  case $answer in
-      [Yy]*) nop= ;;
-      *) echo "Not building"
-        exit 1
-         ;;
-  esac
-fi
-
 if [ ! -z ${opt_commit} ]; then
     echo "Committing to CVS server"
     cvs commit -m "Committing for ${VERSION}"
@@ -64,6 +52,18 @@ if [ ! -z ${opt_tag} ]; then
     cvs -q tag -F $UPSTREAM_TAG > /dev/null
 fi
 
+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
+  case $answer in
+      [Yy]*) nop= ;;
+      *) echo "Not building"
+        exit 1
+         ;;
+  esac
+fi
+
 
 if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
   echo "Making documentation"
@@ -78,6 +78,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
+make distclean
 rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh make-doc.sh 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS -or -name .deps`