r1881: *** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index dfad14cc4903b9b6af1e6281962987a1c237e14b..2c18e42d54bc2cc0f1c502379e2e20446504f99b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ else
 EXTRA_DIRS3=
 endif
 
-SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) man doc libctsupport libctsim  html cgi-bin include  $(EXTRA_DIRS3) tools helical
+SUBDIRS=man doc libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2 $(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
 

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

diff --git a/debian/rules b/debian/rules
index 466ad74583c846521523734a86766e76090f6789..fb7972cf9a4ee3f4497dd6c4e160f9cf607b48e6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ pkg   := ctsim
 prefix := debian/$(pkg)
 DESTDIR := `pwd`/$(prefix)
 SHAREDOCDIR := $(DESTDIR)/usr/share/doc/$(pkg)
-SHAREDATADIR := $(DESTDIR)/usr/share/$(pkg)
+SHAREDATADIR := $(DESTDIR)/usr/share/$(pkg)/.
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
@@ -52,6 +52,7 @@ install: build
        # Add here commands to install the package into debian/ctsim.
        ${MAKE} install
        $(INSTALL) $(INSTALLFLAGS) $(shell echo doc/html/*) $(SHAREDOCDIR)/html
+       ln -sf $(pkg)_contents.html $(SHAREDOCDIR)/html/index.html
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2682487020f5005aced1baa63a2fd0f1b278158..80fcbfac849a180f4e8b1ea8551ddb9474f1593e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,7 +11,7 @@ CLEANFILES=$(pkg).ps $(pkg)*.html $(pkg).hhc $(pkg).hhp $(pkg).hhk \
 all-local: htmlhelp html dvi 
 
 install-data-hook: $(pkg).htb
-       cp $(pkg).htb $(datadir)
+       install -g root -o root -m 0644 $(pkg).htb $(datadir)
 
 .PHONY: ps
 ps: ctsim.ps
@@ -51,6 +51,7 @@ html: $(docs)
        tex2rtf $(pkg).tex $(pkg).html -html  > /dev/null
        rm -rf html
        mkdir html
-       ln -s $(pkg)_contents.html html/index.html
+       cp *.gif html
+       mv *.html html
 
 

diff --git a/make-dist.sh b/make-dist.sh
index 536fd69f1d3c322a56ccf1343c6cd902d097ead0..7934db6be0f3c66800f73f91cf206b4f743e712d 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -29,7 +29,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 # Remove junk from distribution dir
 pushd ${DISTDIR}
-make distclean
+make clean
 popd
 rm -f `find ${DISTDIR} -type f -name .cvsignore`
 rm -rf `find ${DISTDIR} -type d -name CVS`