r1894: *** empty log message ***

diff --git a/do-autoconf b/do-autoconf
index 2f1ea157a9d0bebef4f5b1fb70e16deaf7cac9c9..28c14fc094a95eeab0615f6d271b49ca7e020249 100755 (executable)
--- a/do-autoconf
+++ b/do-autoconf
@@ -1,8 +1,7 @@
 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  $*
+./configure --prefix=/usr --with-cgibin-dir=/usr/lib/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/var/www/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/var/www/ctsim --without-lam-dir  $*
 
 
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8c6d2f65144efcb62bc729bbcc3758227aac3f2d..39cd13e8512bb9b05b2b8e76180c711dc0f548a9 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -96,7 +96,7 @@ pkg = ctsim
 
 EXTRA_DIST = $(docs) html
 
-CLEANFILES = $(pkg).ps $(pkg)*.html $(pkg).hhc $(pkg).hhp $(pkg).hhk $(pkg).bib $(pkg).zip \*.aux \*.log $(pkg).ilg $(pkg).ind $(pkg).pdf $(pkg).dvi \*~ \#\*~ \#\*\# \.\*~
+CLEANFILES = $(pkg).ps $(pkg)*.html $(pkg).hhc $(pkg).hhp $(pkg).hhk $(pkg).bib $(pkg).zip \*.aux \*.log $(pkg).ilg $(pkg).ind $(pkg).dvi \*~ \#\*~ \#\*\# \.\*~
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -217,7 +217,7 @@ $(pkg).pdf: $(pkg).dvi
 .PHONY: ps
 ps: $(pkg).ps
 $(pkg).ps: $(pkg).pdf
-       pdf2ps $(pkg).pdf $(pkg).ps
+       pdftops $(pkg).pdf $(pkg).ps
 
 .PHONY: dvi
 dvi: $(pkg).dvi

diff --git a/doc/ctsim.htb b/doc/ctsim.htb
index 077b16addb4203c7d55b130e0a3ff0aff1e217fb..662236631c5a65aa57bb1d52b4034eb974743212 100644 (file)
Binary files a/doc/ctsim.htb and b/doc/ctsim.htb differ

diff --git a/helical/Makefile.am b/helical/Makefile.am
index ce6143e1fea8230c36e543bb1f0e54cc6af02b73..b4c1253f2865199a1d00d0d86cad59c4968875ce 100644 (file)
--- a/helical/Makefile.am
+++ b/helical/Makefile.am
@@ -1,5 +1,5 @@
-bin_SCRIPTS = sample-helical.sh
+# bin_SCRIPTS = sample-helical.sh
+
+CLEANFILES=\*.pgm \*.if \*~ \*.pj \.*~ \#\*\# \#\*~
 
-realclean:
-       rm -f *.pgm *.if *~ *.pj
 

diff --git a/helical/Makefile.in b/helical/Makefile.in
index bdbf863fe56740bd675289a9f8c454a7b3fa3d3b..23cbbcbd7d8546256516384ca19fb8abb3ccaf8c 100644 (file)
--- a/helical/Makefile.in
+++ b/helical/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -101,7 +101,7 @@ DIST_COMMON =  Makefile.am Makefile.in sample-helical.sh.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

diff --git a/make-dist.sh b/make-dist.sh
index a5d6edb406321da6e01e40142e41a60c579aaa53..49199982787b610388d79eb0323e180314370947 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -43,8 +43,10 @@ rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
 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 '*.cpp' -or -name '*.sh' -or -name '*.in' -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 '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \
   -name COPYING* -or -name catalog` 
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 

diff --git a/man/Makefile.in b/man/Makefile.in
index f4a489d537e2413640ce7a9cfb26b0a072048956..6df6348dcfd59588540e0a06bbb839e4d9f40f3d 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -90,7 +90,7 @@ wxcflags = @wxcflags@
 wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
-man_MANS = pjrec.1 phm2pj.1 phm2if.1 ifexport.1 ifinfo.1 if1.1 if2.1 pjinfo.1 ifinfo.1 pj2if.1 ctsim.1 ctsimtext.1 phm2helix.1
+man_MANS = pjrec.1 phm2pj.1 phm2if.1 ifexport.1 ifinfo.1 if1.1 if2.1 pjinfo.1 ifinfo.1 pj2if.1 ctsim.1 ctsimtext.1 phm2helix.1 pjHinterp.1
 EXTRA_DIST = $(man_MANS) 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h

diff --git a/tools/Makefile.in b/tools/Makefile.in
index dd7360804f8205fe4467a3a4f719fe6e3986e328..888a7456021401dc34b3525fd918caf3c3fc1830 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -389,6 +389,7 @@ install-exec-hook:
        ln -sf ctsimtext $(bindir)/pj2if
        ln -sf ctsimtext $(bindir)/pjinfo
        ln -sf ctsimtext $(bindir)/pjrec
+       ln -sf ctsimtext $(bindir)/pjHinterp
 
 realclean:
        rm -f *.pgm *.if *~ *.pj