r1979: *** empty log message ***

[ctsim.git] / make-upstream.sh

diff --git a/make-upstream.sh b/make-upstream.sh
index 6c0e258f7a9f09071428e1fa87e3867c00a940c8..67011b8585cbf4e5696f4fbbf06c2e270a2d60aa 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -47,9 +47,7 @@ fi
 
 if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
   echo "Making documentation"
-  pushd doc
-  make all
-  popd
+  ../make-doc.sh
 fi
 
 # Prepare for archive
@@ -60,7 +58,7 @@ 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 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`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
@@ -73,7 +71,6 @@ echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-rm -rf ${DISTDIR}
 if [ "${DISTDIR}" != "${DEBDIR}" ]; then 
   cp -a ${DISTDIR} ${DEBDIR}
 else
@@ -87,7 +84,7 @@ unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
   -name '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \
   -name COPYING* -or -name catalog` 
 zip -rq ${DISTDIR}.zip ${DISTDIR}
-rm -r {$DISTDIR}
+rm -r ${DISTDIR}
 
 if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
   mv ${DEBDIR}-copy ${DEBDIR}