X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=536fd69f1d3c322a56ccf1343c6cd902d097ead0;hb=a01d4e203e2be95bce136ef87f9c847ecceb54ef;hp=ece2de04ee063c37acf37ec5cb7a415b43ff1ef1;hpb=ed02e237823d9aad102931561b60001d4feab810;p=ctsim.git

diff --git a/make-dist.sh b/make-dist.sh
index ece2de0..536fd69 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -22,30 +22,31 @@ TAG=upstream_version_`echo $VERSION | tr . _`
 
 # build the tarball
 echo "building tarballs"
-cd ..
+pushd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
 rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
 cp -a ${TOPDIR} ${DISTDIR}
 
 # Remove junk from distribution dir
-find ${DISTDIR} -type f -name .cvsignore -exec rm {} \;
-find ${DISTDIR} -type d -name CVS | xargs rm -r
-find ${DISTDIR} -type f -name *~ -or -name ".#*" -or -name "#*#" |xargs rm -f
-find ${DISTDIR}/doc -type f -and -name *.tex -or -name *.aux -or \
-    -name *.log -or -name *.out -or -name *.dvi | xargs rm -f
+pushd ${DISTDIR}
+make distclean
+popd
+rm -f `find ${DISTDIR} -type f -name .cvsignore`
+rm -rf `find ${DISTDIR} -type d -name CVS`
+rm -f `find ${DISTDIR} -type f -name '*~' -or -name '.*~' -or \
+   -name '.#*' -or -name '#*#'`
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
-cd ${DISTDIR}
+pushd ${DISTDIR}
 make distclean
-cd ..
+popd
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-find ${DISTDIR} -type f -and -name *.c -or -name *.h -or -name *.list -or \
-    -name Makefile -or -name ChangeLog -or \
-    -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL \
-    -or -name NEWS -or -name *.sgml -or -name COPYING* -or -name catalog \
-    | xargs unix2dos
+unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
+  -name Makefile -or -name ChangeLog -or -name COPYRIGHT -or -name TODO -or \
+  -name README -or -name INSTALL -or -name NEWS -or -name '*.tex' -or \
+  -name COPYING* -or -name catalog` 
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 rm -rf ${DISTDIR}
@@ -60,14 +61,15 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 
 # dpkg-source ${DEBDIR} ${PKG}_${VERSION}.orig.tar.gz
 
-cd ${DEBDIR}
+pushd ${DEBDIR}
 dpkg-buildpackage -rfakeroot -kkevin@b9.com  #-tc -b
-cd ..
+popd
 rm -r ${DEBDIR}
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
 mkdir -p /usr/local/src/Packages/${DEBPKG}
 mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
-cd ${TOPDIR}
+
+popd
 exit 0