r1880: *** empty log message ***

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 91716e0547f96dec6029e48ecd36f5bc68851596..d2682487020f5005aced1baa63a2fd0f1b278158 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-docs = ctsim.tex texhelp.sty psbox.tex logo.eps logo.gif ctsim-sgp.tex ctsim-concepts.tex ctsim-gui.tex ctsim-install.tex ctsim-textui.tex ctsim-web.tex alphacalc.eps alphacalc.gif divergent.eps divergent.gif equiangular.eps equiangular.gif equilinear.eps equilinear.gif scangeometry.eps scangeometry.gif tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim-latex.bib ctsim-tex2rtf.bib
+docs := ctsim.tex texhelp.sty psbox.tex logo.eps logo.gif ctsim-sgp.tex ctsim-concepts.tex ctsim-gui.tex ctsim-install.tex ctsim-textui.tex ctsim-web.tex alphacalc.eps alphacalc.gif divergent.eps divergent.gif equiangular.eps equiangular.gif equilinear.eps equilinear.gif scangeometry.eps scangeometry.gif tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim-latex.bib ctsim-tex2rtf.bib
 
 pkg=ctsim
 
@@ -42,7 +42,7 @@ htmlhelp: $(docs)
        rm -f $(pkg)*.html $(pkg).hhp $(pkg).hhc $(pkg).hhk $(pkg).zip
        cp $(pkg)-tex2rtf.bib $(pkg).bib
        tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
-       zip $(pkg).zip *.html *.gif $(pkg).hh[pck]
+       zip -q $(pkg).zip *.html *.gif $(pkg).hh[pck]
        mv $(pkg).zip $(pkg).htb
 
 html: $(docs)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3bf10ea35827bfaed08c6f2e1e5eeb213f1d41c3..046943d93d96f67ebef1b7a8b0532c4a34103d83 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -90,13 +90,13 @@ wxcflags = @wxcflags@
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
-docs = ctsim.tex texhelp.sty psbox.tex logo.eps logo.gif ctsim-sgp.tex ctsim-concepts.tex ctsim-gui.tex ctsim-install.tex ctsim-textui.tex ctsim-web.tex alphacalc.eps alphacalc.gif divergent.eps divergent.gif equiangular.eps equiangular.gif equilinear.eps equilinear.gif scangeometry.eps scangeometry.gif tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim-latex.bib ctsim-tex2rtf.bib
+docs := ctsim.tex texhelp.sty psbox.tex logo.eps logo.gif ctsim-sgp.tex ctsim-concepts.tex ctsim-gui.tex ctsim-install.tex ctsim-textui.tex ctsim-web.tex alphacalc.eps alphacalc.gif divergent.eps divergent.gif equiangular.eps equiangular.gif equilinear.eps equilinear.gif scangeometry.eps scangeometry.gif tex2rtf.ini ctsim.hpj bullet.bmp verbatim.sty mytitle.sty makeidx.sty mysober.sty fancyhea.sty ctsim-latex.bib ctsim-tex2rtf.bib
 
 pkg = ctsim
 
 EXTRA_DIST = $(docs) html
 
-CLEANFILES = $(pkg).ps $(pkg)*.html $(pkg).hhc $(pkg).hhp $(pkg).hhk    $(pkg).bib $(pkg).zip *.aux *.log *~ \#*~ \#*\# \.*~ 
+CLEANFILES = $(pkg).ps $(pkg)*.html $(pkg).hhc $(pkg).hhp $(pkg).hhk   $(pkg).bib $(pkg).zip *.aux *.log *~ \#*~ \#*\# \.*~    $(pkg).ilg $(pkg).ind
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -239,7 +239,7 @@ htmlhelp: $(docs)
        rm -f $(pkg)*.html $(pkg).hhp $(pkg).hhc $(pkg).hhk $(pkg).zip
        cp $(pkg)-tex2rtf.bib $(pkg).bib
        tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
-       zip $(pkg).zip *.html *.gif $(pkg).hh[pck]
+       zip -q $(pkg).zip *.html *.gif $(pkg).hh[pck]
        mv $(pkg).zip $(pkg).htb
 
 html: $(docs)

diff --git a/doc/ctsim.htb b/doc/ctsim.htb
index aad41bf0cbcd9814c985b5d37ea1759a6dacd193..ca9aab36d3302c613798f673362fc3987ab9d9b6 100644 (file)
Binary files a/doc/ctsim.htb and b/doc/ctsim.htb differ

diff --git a/make-dist.sh b/make-dist.sh
index ece2de04ee063c37acf37ec5cb7a415b43ff1ef1..536fd69f1d3c322a56ccf1343c6cd902d097ead0 100755 (executable)
--- 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