r1846: debian updates

diff --git a/debian/rules b/debian/rules
index 895b8de4731de3171498c5420480a5a0d2df1c67..406ea396f0120f3bfc43fcfa451bbd4266dc6c5b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,7 @@ clean:
 
        # Add here commands to clean up after the build process.
        -$(MAKE) distclean
+       find . -type f -and -name *~ -or -name .*~ -exec rm -f {} \;
        rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
 
        dh_clean

diff --git a/make-dist.sh b/make-dist.sh
index d45b238fde9455930beb7ba95c00cebef100588b..d974a75d6ad5bc0f63a815002953321375ef72d7 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -30,9 +30,9 @@ cp -a ${TOPDIR} ${DISTDIR}
 # Remove junk from distribution dir
 find ${DISTDIR} -type f -name .cvsignore -exec rm {} \;
 find ${DISTDIR} -type d -name CVS | xargs rm -r
-find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
-    -name \*.log -or -name \*.out -or -name \*.dvi -or \
-    -name \*~ -or -name .\#\*  -or -name \#*\# |xargs rm -f
+find ${DISTDIR}/doc -type f -and -name *.tex -or -name *.aux -or \
+    -name *.log -or -name *.out -or -name *.dvi -or \
+    -name *~ -or -name ".#*"  -or -name "#*#" |xargs rm -f
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
@@ -41,30 +41,33 @@ make distclean
 cd ..
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-find ${DISTDIR} -type f -and -name \*.c -or -name \*.h -or -name \*.list -or \
-    -name \*.system -or -name Makefile -or -name ChangeLog -or \
+find ${DISTDIR} -type f -and -name *.c -or -name *.h -or -name *.list -or \
+    -name Makefile -or -name ChangeLog -or \
     -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL \
-    -or -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog \
+    -or -name NEWS -or -name *.sgml -or -name COPYING* -or -name catalog \
     | xargs unix2dos
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
 rm -rf ${DISTDIR}
 
 tar xzf ${DISTDIR}.tar.gz 
+cp ${DISTDIR}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
+
 if [ "${DISTDIR}" != "${DEBDIR}" ]; then
   mv ${DISTDIR} ${DEBDIR}
 fi
 cp -a ${TOPDIR}/debian ${DEBDIR}
 
-cp ${DISTDIR}.tar.gz ${PKG}_${VERSION}.orig.tar.gz
+# dpkg-source ${DEBDIR} ${PKG}_${VERSION}.orig.tar.gz
+
 cd ${DEBDIR}
-dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
+dpkg-buildpackage -rfakeroot -kkevin@b9.com  #-tc -b
 cd ..
-# rm -rf ${DEBDIR}
+
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
 mkdir -p /usr/local/share/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
+# mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
 cd ${TOPDIR}
 exit 0

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9805b086d932976511141b127a093044d0479eeb..8392b50dddafc954678283287ec02db999707d4c 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -9,26 +9,16 @@ SOURCE_DEPEND=../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsuppor
 endif
 
 install-exec-hook:
-       rm -f $(bindir)/if1
-       rm -f $(bindir)/if2
-       rm -f $(bindir)/ifexport
-       rm -f $(bindir)/ifinfo
-       rm -f $(bindir)/phm2if
-       rm -f $(bindir)/phm2pj
-       rm -f $(bindir)/phm2helix
-       rm -f $(bindir)/pj2if
-       rm -f $(bindir)/pjinfo
-       rm -f $(bindir)/pjrec
-       ln -s $(bindir)/ctsimtext $(bindir)/if1
-       ln -s $(bindir)/ctsimtext $(bindir)/if2
-       ln -s $(bindir)/ctsimtext $(bindir)/ifexport
-       ln -s $(bindir)/ctsimtext $(bindir)/ifinfo
-       ln -s $(bindir)/ctsimtext $(bindir)/phm2if
-       ln -s $(bindir)/ctsimtext $(bindir)/phm2pj
-       ln -s $(bindir)/ctsimtext $(bindir)/phm2helix
-       ln -s $(bindir)/ctsimtext $(bindir)/pj2if
-       ln -s $(bindir)/ctsimtext $(bindir)/pjinfo
-       ln -s $(bindir)/ctsimtext $(bindir)/pjrec
+       ln -sf ctsimtext $(bindir)/if1
+       ln -sf ctsimtext $(bindir)/if2
+       ln -sf ctsimtext $(bindir)/ifexport
+       ln -sf ctsimtext $(bindir)/ifinfo
+       ln -sf ctsimtext $(bindir)/phm2if
+       ln -sf ctsimtext $(bindir)/phm2pj
+       ln -sf ctsimtext $(bindir)/phm2helix
+       ln -sf ctsimtext $(bindir)/pj2if
+       ln -sf ctsimtext $(bindir)/pjinfo
+       ln -sf ctsimtext $(bindir)/pjrec
 
 ctsimtext_SOURCES = ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp nographics.cpp phm2helix.cpp pjHinterp.cpp
 ctsimtext_LDADD=@ctlibs@
@@ -46,7 +36,7 @@ LAM_EXTRA_SRC = mpiworld.cpp
 
 ctsimtext_lam_DEPENDENCIES=$(SOURCE_DEPEND)
 
-ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
+ctsimtext-lam: ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp mpiworld.cpp ../include/ct.h ../libctsim/libctsim.a ../libctsupport/libctsupport.a
        $(CC_LAM) @DEFS@ @lamdefs@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI -DNO_MAIN ctsimtext.cpp if1.cpp if2.cpp ifinfo.cpp ifexport.cpp phm2if.cpp phm2pj.cpp pj2if.cpp pjinfo.cpp pjrec.cpp -o ctsimtext-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@
 
 endif