r1844: *** empty log message ***

diff --git a/debian/ctsim.manpages b/debian/ctsim.manpages
deleted file mode 100644 (file)
index 163af37..0000000
--- a/debian/ctsim.manpages
+++ /dev/null
@@ -1,10 +0,0 @@
-man/ctsim.1
-man/if1.1
-man/if2.1
-man/ifexport.1
-man/ifinfo.1
-man/phm2if.1
-man/phm2pj.1
-man/pj2if.1
-man/pjinfo.1
-man/pjrec.1

diff --git a/debian/dirs b/debian/dirs
index 92e3e7c851e20a992cabd56848bf5732571ceae1..d42d3c0b4df6e2c328ad74b6bb5fc6e7512deeb5 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,4 +2,4 @@
 /usr/bin
 /usr/share
 /usr/share/doc
-/usr/man
+/usr/share/man

diff --git a/debian/rules b/debian/rules
index bc74840a4fb5cee74ab80d9c16f17d6c148c71eb..895b8de4731de3171498c5420480a5a0d2df1c67 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ export DH_COMPAT=3
 
 pkg    := ctsim
 prefix := debian/$(pkg)
+DESTDIR := `pwd`/$(prefix)
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
@@ -19,7 +20,7 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --prefix=${prefix}/usr
+       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man
        touch configure-stamp
 
 
@@ -52,6 +53,7 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/ctsim.
+       # install ${INSTALLDIRFLAGS} 
        ${MAKE} install
 
 # Build architecture-independent files here.
@@ -65,7 +67,7 @@ binary-arch: build install
        dh_testroot
 #      dh_installdebconf       
        dh_installdocs
-#      dh_installexamples examples/*.cl
+       dh_installexamples tools/sample-ctsim.sh helical/sample-helical.sh
 #      dh_installmenu
 #      dh_installlogrotate
 #      dh_installemacsen
@@ -73,7 +75,7 @@ binary-arch: build install
 #      dh_installmime
 #      dh_installinit
 #      dh_installcron
-       dh_installman
+#      dh_installman
 #      dh_installinfo
 #      dh_undocumented
        dh_installchangelogs ChangeLog

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 951ec21e6b68d16b43d81757b29d1300a357f0f7..9805b086d932976511141b127a093044d0479eeb 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,4 @@
 bin_PROGRAMS = @lamprograms@  ctsimtext 
-bin_SCRIPTS = sample-ctsim.sh
 EXTRA_PROGRAMS = ctsimtext-lam
 INCLUDES=@my_includes@