r3887: Automatic commit for debian_version_4_1_0-1

diff --git a/Makefile.am b/Makefile.am
index 015a2b7370202f208f2e2eb66483de24eac51518..bf03d3da635968b8d00446b5eb714f2498cc448f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,9 @@ SUBDIRS=man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_D
 
 EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 
-install-data-hook: 
-       test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
-       install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
+#install-data-hook: 
+#      test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
+#      install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
 
 
 

diff --git a/debian/rules b/debian/rules
index 96f290dadaeb3ee3176270bc953917451d07a8c3..90008fd3ff1cbb97a92ce55992a7882e49453805 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ pkg-athlon      := ctsim-athlon
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
 
+ctsim-shared   := usr/share/ctsim
+
 prefix         := debian/$(pkg)
 prefix-p4      := debian/$(pkg-p4)
 prefix-athlon  := debian/$(pkg-athlon)
@@ -17,7 +19,7 @@ prefix-doc    := debian/$(pkg-doc)
 DESTDIR                := `pwd`/$(prefix)
 DESTDIR-P4     := `pwd`/$(prefix-p4)
 DESTDIR-ATHLON := `pwd`/$(prefix-athlon)
-HELPDIR                := `pwd`/$(prefix-help)/usr/share/ctsim
+HELPDIR                := `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir                := usr/share/doc/$(pkg-doc)
 pixmap-dir     := usr/X11R6/include/X11/pixmaps
 
@@ -32,6 +34,7 @@ build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
        dh_testdir
        # Add here commands to compile the package.
+       dh_installdirs -p $(pkg-help) $(ctsim-shared)
        ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
        $(MAKE) all
        ${MAKE} install
@@ -76,6 +79,7 @@ install: build
        # Add here commands to install the package into debian/ctsim.
        dh_installdirs -p $(pkg-help) $(pixmap-dir)
        dh_install -p $(pkg-help) debian/ctsim.xpm $(pixmap-dir)
+       dh_install -p $(pkg-help) docs/ctsim.htb $(ctsim-shared)
        dh_install -p $(pkg-doc) docs/html $(doc-dir)
        dh_link -p $(pkg-doc) $(doc-dir)/html/$(pkg)_contents.html $(doc-dir)/html/index.html
        gzip -9 docs/ctsim.pdf