r2215: *** empty log message ***

diff --git a/debian/cvsbp-prepare.sh b/debian/cvsbp-prepare.sh
index 0f81021764f0716ed9c566864aabf261dc16c9c6..511dcaf1c10d9ae0716dab15e8e76b8f07395ac4 100755 (executable)
--- a/debian/cvsbp-prepare.sh
+++ b/debian/cvsbp-prepare.sh
@@ -2,20 +2,9 @@
 
 set -e  # abort on error
 
-# Make documentation to put in debian package 
-# This must match prebuilt upstream documentation
-
-if [ -f make-doc.sh ]; then
-  echo "Making upstream documentation for CVS checked-out package"
-  ./make-doc.sh
-else
-  echo "Unable to build documentation for CVS checked out package"
-  exit 1
-fi
-
 # Clean checked out CVS directory
 rm -f debian/upload.sh debian/make-upstream.sh debian/make-debian.sh debian/cvsbp-prepare.sh
-rm -f make-doc.sh do-autoconf
+rm -f do-autoconf
 rm -f `find . -type f -name .cvsignore`
 rm -rf images doc stamp-h.in build-stamp configure-stamp
 rm -f cvsbp-prepare.sh

diff --git a/debian/make-upstream.sh b/debian/make-upstream.sh
index ca36845277eede52d23e62a69ab8947b55236a96..e4e966005c700125a5f91def08fed2494d5cc8f2 100755 (executable)
--- a/debian/make-upstream.sh
+++ b/debian/make-upstream.sh
@@ -33,10 +33,9 @@ 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
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -46,7 +45,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"`

diff --git a/doc/Makefile b/doc/Makefile
index 3b79ebfa8d720696ebc9a5d86102e9aecb99c716..2461037151b903003a60ca28a93583e68a4074b4 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,14 +11,17 @@ clean:
        @rm -rf html
 
 .PHONY: pdf
-pdf: $(pkg).pdf
-$(pkg).pdf: $(pkg).dvi
+pdf: ../docs/$(pkg).pdf
+
+../docs/$(pkg).pdf: $(docs)
+       $(MAKE) dvi
        dvipdfm $(pkg)
+       mv $(pkg).pdf ../docs
 
-.PHONY: ps
-ps: $(pkg).ps
-$(pkg).ps: $(pkg).pdf
-       pdftops $(pkg).pdf $(pkg).ps
+#.PHONY: ps
+#ps: $(pkg).ps
+#$(pkg).ps: $(pkg).pdf
+#      pdftops $(pkg).pdf $(pkg).ps
 
 .PHONY: dvi
 dvi: $(pkg).dvi
@@ -31,21 +34,31 @@ $(pkg).dvi: $(docs)
        latex $(pkg)
 
 .PHONY: htmlhelp
-htmlhelp: $(docs)
+htmlhelp: ../docs/$(pkg).htb
+
+../docs/$(pkg).htb: $(docs)
        rm -f $(pkg)*.html $(pkg).hh[pck] $(pkg).zip
        cp $(pkg)-tex2rtf.bib $(pkg).bib
        tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
        ./maphhc.pl
        zip -q $(pkg).zip *.html *.gif $(pkg).hh[pck]
        mv $(pkg).zip $(pkg).htb
+       mv $(pkg).htb ../docs
 
 .PHONY: html
-html: htmlhelp
+html: ../docs/html.tar.gz
+
+../docs/html.tar.gz: $(docs)
+       rm -f $(pkg)*.html
+       cp $(pkg)-tex2rtf.bib $(pkg).bib
+       tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
        rm -rf html
        mkdir html
        cp *.gif html
-       mv *.html html
+       mv $(pkg)*.html html
        GZIP='-9' tar czf html.tar.gz html
+       mv html.tar.gz ../docs
+       rm -r html
 
 #.PHONY: winhelp
 #winhelp: $(docs)

diff --git a/docs/ctsim.pdf b/docs/ctsim.pdf
index 45500ee7109953d73c75d11c074788ad2098979c..f2324e2a1ef13740f68f78cf150fb576694ca844 100644 (file)
Binary files a/docs/ctsim.pdf and b/docs/ctsim.pdf differ

diff --git a/docs/html.tar.gz b/docs/html.tar.gz
index f731797ec3fc1cc79231a3ec5d837b7abf5f98b5..b596b10d42da000d0b8180c51573730605948c94 100644 (file)
Binary files a/docs/html.tar.gz and b/docs/html.tar.gz differ

diff --git a/make-doc.sh b/make-doc.sh
deleted file mode 100755 (executable)
index 23601b4..0000000
--- a/make-doc.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-WORK_DIR=/usr/local/src/Work/ctsim
-
-pushd ${WORK_DIR} > /dev/null
-cd doc
-make all
-cd ..
-mv doc/html.tar.gz docs
-mv doc/ctsim.htb docs
-mv doc/ctsim.pdf docs
-make clean
-popd > /dev/null