r1852: *** empty log message ***

diff --git a/Makefile.in b/Makefile.in
index 10c58e31705ccb37b5fbb99ef14691c53b15c90c..f14e22e04e353a0a53b4dffb7038c6a26725076d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,7 +96,7 @@ wxlibs = @wxlibs@
 @HAVE_WXWINDOWS_TRUE@EXTRA_DIRS3 = src
 @HAVE_WXWINDOWS_FALSE@EXTRA_DIRS3 = 
 
-SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim man doc html cgi-bin include  $(EXTRA_DIRS3) tools helical
+SUBDIRS = $(EXTRA_DIRS1) $(EXTRA_DIRS2) man doc libctsupport libctsim  html cgi-bin include  $(EXTRA_DIRS3) tools helical
 
 EXTRA_DIST = acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -113,7 +113,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
-DIST_SUBDIRS =  getopt libctgraphics libctsupport libctsim man doc html \
+DIST_SUBDIRS =  getopt libctgraphics man doc libctsupport libctsim html \
 cgi-bin include src tools helical
 all: all-redirect
 .SUFFIXES:

diff --git a/debian/rules b/debian/rules
index b1370c9ccecc0cec561016e33c7fb0f633b4efd3..ab5ea57719bc92f55a75d5cca633cb9c65b370e3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,23 +28,18 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
-
        # Add here commands to compile the package.
        $(MAKE) 
-       #/usr/bin/docbook-to-man debian/uffi.sgml > uffi.1
-
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
-
        # Add here commands to clean up after the build process.
        -$(MAKE) distclean
        find . -type f -and -name *~ -or -name .*~ -exec rm -f {} \;
        rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
-
        dh_clean
 
 install: build
@@ -56,7 +51,6 @@ install: build
        # Add here commands to install the package into debian/ctsim.
        # install ${INSTALLDIRFLAGS} 
        ${MAKE} install
-       cp -a doc/html $(DESTDIR)/usr/share/doc/${PKG}
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -68,7 +62,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
 #      dh_installdebconf       
-#      dh_installdocs
+       dh_installdocs doc/html
        dh_installexamples tools/sample-ctsim.sh helical/sample-helical.sh
 #      dh_installmenu
 #      dh_installlogrotate

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 05e93491248af8463f07188cf20bb4fb97ca01e0..6ab72433a0736a110bac52cda511385acde938f4 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -90,10 +90,9 @@ wxcflags = @wxcflags@
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
-docs = ctsim.tex ctsim.bib 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.bib 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.bib ctsim-latex.bib ctsim-tex2rtf.bib
 
-
-EXTRA_DIST = ${docs} ctsim.htb 
+EXTRA_DIST = ${docs} html
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -198,12 +197,12 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-ps: ctsim.ps
-ctsim.ps: ctsim.dvi
-       dvips ctsim
+#ps: ctsim.ps
+#ctsim.ps: ctsim.dvi
+#      dvips ctsim
 
 dvi: ctsim.dvi
-ctsim.dvi: ctsim.tex
+ctsim.dvi: $(docs)
        cp ctsim-latex.bib ctsim.bib
        latex ctsim
        bibtex ctsim
@@ -211,7 +210,7 @@ ctsim.dvi: ctsim.tex
        makeindex ctsim
        latex ctsim
 
-winhelp: ctsim.tex
+winhelp: $(docs)
        rm -f ctsim.rtf ctsim.cnt
        cp ctsim-tex2rtf.bib ctsim.bib
        tex2rtf ctsim.tex ctsim.rtf -winhelp
@@ -219,7 +218,7 @@ winhelp: ctsim.tex
        mv CTSIM.HLP ctsim.hlp
        cp ctsim.hlp ctsim.cnt ../msvc/ctsim/
 
-htmlhelp: ctsim.tex
+htmlhelp: $(docs)
        rm -f ctsim*.html ctsim.hhp ctsim.hhc ctsim.hhk ctsim.zip
        cp ctsim-tex2rtf.bib ctsim.bib
        tex2rtf ctsim.tex ctsim.html -html
@@ -228,7 +227,7 @@ htmlhelp: ctsim.tex
        cp ctsim.htb ../msvc/ctsim/.
        cp ctsim.htb ../src/.
 
-html:
+html: $(docs)
        rm -f ctsim*.html ctsim.hhp ctsim.hhc ctsim.hhk ctsim.zip
        cp ctsim-tex2rtf.bib ctsim.bib
        tex2rtf ctsim.tex ctsim.html -html

diff --git a/make-dist.sh b/make-dist.sh
index d974a75d6ad5bc0f63a815002953321375ef72d7..a7d3c5dfa81488dad855cbb12cdca418cbdfa2fd 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -63,11 +63,11 @@ cp -a ${TOPDIR}/debian ${DEBDIR}
 cd ${DEBDIR}
 dpkg-buildpackage -rfakeroot -kkevin@b9.com  #-tc -b
 cd ..
-
+rm -r ${DEBDIR}
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
 mkdir -p /usr/local/share/Packages/${DEBPKG}
-# mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
 cd ${TOPDIR}
 exit 0