r2217: Autocommitting for 3.5.7

[ctsim.git] / debian / make-upstream.sh

diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
index ca36845277eede52d23e62a69ab8947b55236a96..8cc553168d255b192f7a7a07b477ab15c8885327 100755 (executable)
--- a/debian/make-upstream.sh
+++ b/debian/make-upstream.sh
@@ -33,12 +33,12 @@ if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
 fi
 
 
-if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
-  echo "Making documentation"
-  ${WORK_DIR}/make-doc.sh
-fi
+echo "Making documentation"
+cd ${WORK_DIR}/doc
+make
 
-# Prepare for archive
+echo "Copying archive"
+cd ${WORK_HOME}
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
 rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${WORK_DIR} ${DISTDIR}
@@ -46,7 +46,6 @@ cp -a ${WORK_DIR} ${DISTDIR}
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
 make distclean
-rm -f make-doc.sh 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS -or -name .deps`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~" -or -name "*.o" -or -name "*.a"`