r1877: *** empty log message ***

diff --git a/debian/dirs b/debian/dirs
index d33a97941e714b57533e2916b51e1370918a7159..68e650c17c72a9b632175148de218d51040ff7ad 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,6 +1,8 @@
-/usr
-/usr/bin
-/usr/share
-/usr/share/doc
-/usr/share/man
-/usr/share/ctsim
+usr
+usr/bin
+usr/share
+usr/share/doc
+usr/share/doc/ctsim
+usr/share/doc/ctsim/html
+usr/share/man
+usr/share/man1

diff --git a/debian/rules b/debian/rules
index e076c2a37eb46392b2e8c4fa8e89c6b92d2e482d..466ad74583c846521523734a86766e76090f6789 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,8 @@ export DH_COMPAT=3
 pkg    := ctsim
 prefix := debian/$(pkg)
 DESTDIR := `pwd`/$(prefix)
-SHAREDOCDIR := $(DESTDIR)/usr/share/$(pkg)
+SHAREDOCDIR := $(DESTDIR)/usr/share/doc/$(pkg)
+SHAREDATADIR := $(DESTDIR)/usr/share/$(pkg)
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
@@ -21,7 +22,7 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man
+       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(SHAREDATADIR)
        touch configure-stamp
 
 
@@ -31,7 +32,6 @@ build-stamp: configure-stamp
        dh_testdir
        # Add here commands to compile the package.
        $(MAKE) 
-       (cd doc; $(MAKE) htmlhelp)
        touch build-stamp
 
 clean:
@@ -49,17 +49,14 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-
        # Add here commands to install the package into debian/ctsim.
-       # install ${INSTALLDIRFLAGS} 
        ${MAKE} install
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.htb) $(SHAREDOCDIR)
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo doc/html/*) $(SHAREDOCDIR)/html
 
 # Build architecture-independent files here.
 binary-indep: build install
 
 
-
 # Build architecture-dependent files here.
 binary-arch: build install
        dh_testdir

diff --git a/do-autoconf b/do-autoconf
new file mode 100755 (executable)
index 0000000..2f1ea15
--- /dev/null
+++ b/do-autoconf
@@ -0,0 +1,8 @@
+aclocal
+autoconf
+automake
+
+#./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam  $*
+
+
+

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6ab72433a0736a110bac52cda511385acde938f4..3bf10ea35827bfaed08c6f2e1e5eeb213f1d41c3 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -90,9 +90,14 @@ 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.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-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 *~ \#*~ \#*\# \.*~ 
 
-EXTRA_DIST = ${docs} html
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -148,6 +153,8 @@ install-exec-am:
 install-exec: install-exec-am
 
 install-data-am:
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-am
 
 install-am: all-am
@@ -155,7 +162,7 @@ install-am: all-am
 install: install-am
 uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile
+all-am: Makefile all-local
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
@@ -165,6 +172,7 @@ installdirs:
 mostlyclean-generic:
 
 clean-generic:
+       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -192,49 +200,55 @@ maintainer-clean: maintainer-clean-am
 .PHONY: tags distdir info-am info dvi-am dvi check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
+all-local all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
-#ps: ctsim.ps
-#ctsim.ps: ctsim.dvi
-#      dvips ctsim
+all-local: htmlhelp html dvi 
 
-dvi: ctsim.dvi
-ctsim.dvi: $(docs)
-       cp ctsim-latex.bib ctsim.bib
-       latex ctsim
-       bibtex ctsim
-       latex ctsim
-       makeindex ctsim
-       latex ctsim
+install-data-hook: $(pkg).htb
+       cp $(pkg).htb $(datadir)
 
-winhelp: $(docs)
-       rm -f ctsim.rtf ctsim.cnt
-       cp ctsim-tex2rtf.bib ctsim.bib
-       tex2rtf ctsim.tex ctsim.rtf -winhelp
-       hcw /c /m /e ctsim.hpj
-       mv CTSIM.HLP ctsim.hlp
-       cp ctsim.hlp ctsim.cnt ../msvc/ctsim/
+.PHONY: ps
+ps: ctsim.ps
+$(pkg).ps: $(pkg).dvi
+       dvips $(pkg)
+
+.PHONY: dvi
+dvi: $(pkg).dvi
+$(pkg).dvi: $(docs)
+       cp $(pkg)-latex.bib $(pkg).bib
+       latex $(pkg) > /dev/null
+       bibtex $(pkg) > /dev/null
+       latex $(pkg) > /dev/null
+       makeindex $(pkg) > /dev/null
+       latex $(pkg) > /dev/null
 
+.PHONY: winhelp
+winhelp: $(docs)
+       rm -f $(pkg).rtf $(pkg).cnt
+       cp $(pkg)-tex2rtf.bib $(pkg).bib
+       tex2rtf $(pkg).tex $(pkg).rtf -winhelp
+       hcw /c /m /e $(pkg).hpj
+       mv $(PKG).HLP $(pkg).hlp
+       cp $(pkg).hlp $(pkg).cnt ../msvc/$(pkg)/
+
+.PHONY: htmlhelp
 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
-       zip ctsim.zip *.html *.gif ctsim.hhp ctsim.hhc ctsim.hhk
-       mv ctsim.zip ctsim.htb
-       cp ctsim.htb ../msvc/ctsim/.
-       cp ctsim.htb ../src/.
+       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]
+       mv $(pkg).zip $(pkg).htb
 
 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
+       rm -f $(pkg)*.html $(pkg).hh[cpk] $(pkg).zip
+       cp $(pkg)-tex2rtf.bib $(pkg).bib
+       tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
        rm -rf html
        mkdir html
-       ln -s ctsim_contents.html html/index.html
-       mv *.html *.gif html
+       ln -s $(pkg)_contents.html html/index.html
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/doc/ctsim.htb b/doc/ctsim.htb
index 07fd1d51c5c0d177da40f745c22488eb062614a2..2a186fc694cdbf20238fa7375e6c6d8c4fbe364c 100644 (file)
Binary files a/doc/ctsim.htb and b/doc/ctsim.htb differ

diff --git a/l b/l
deleted file mode 100755 (executable)
index 1ba0bd7..0000000
--- a/l
+++ /dev/null
@@ -1,7 +0,0 @@
-aclocal
-autoconf
-automake
-./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam  $*
-
-
-

diff --git a/make-dist.sh b/make-dist.sh
index a7d3c5dfa81488dad855cbb12cdca418cbdfa2fd..ece2de04ee063c37acf37ec5cb7a415b43ff1ef1 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -15,9 +15,9 @@ DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
 TAG=upstream_version_`echo $VERSION | tr . _`
-echo "(re)tagging with release tag '$TAG'"
-cvs -q rtag -d $TAG $PKG
-cvs -q tag -F $TAG
+#echo "(re)tagging with release tag '$TAG'"
+#cvs -q rtag -d $TAG $PKG
+#cvs -q tag -F $TAG
 
 
 # build the tarball
@@ -30,9 +30,9 @@ 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 -or \
-    -name *~ -or -name ".#*"  -or -name "#*#" |xargs rm -f
+    -name *.log -or -name *.out -or -name *.dvi | xargs rm -f
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
@@ -67,7 +67,7 @@ rm -r ${DEBDIR}
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
-mkdir -p /usr/local/share/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
+mkdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
 cd ${TOPDIR}
 exit 0