From 7dd9d98d678ebbb1b15e7b6e8018d720cdd27950 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 3 May 2002 07:56:39 +0000
Subject: [PATCH] r1881: *** empty log message ***

---
 Makefile.am     | 2 +-
 debian/dirs     | 1 +
 debian/rules    | 3 ++-
 doc/Makefile.am | 5 +++--
 make-dist.sh    | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dfad14c..2c18e42 100644
--- 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 68e650c..1e14816 100644
--- 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 466ad74..fb7972c 100755
--- 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 d268248..80fcbfa 100644
--- 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 536fd69..7934db6 100755
--- 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`
-- 
2.34.1