X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=1662a80e48f373affc8ebd9e8d015c9621cac54a;hb=ed6d29bce60de67791eaab35833c32c86c481af3;hp=164c1ebdec88e9d71df06f3c3be776b9dd5db6a8;hpb=3a6c8533812d87bc76df06f0a09586ef2a118170;p=ctsim.git

diff --git a/debian/rules b/debian/rules
index 164c1eb..1662a80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,6 @@ desktop-dir	:= usr/share/applications
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	touch configure.in && touch aclocal.m4 && touch configure
-
 	./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x --without-lam
 	touch configure-stamp
 
@@ -37,17 +35,12 @@ configure-stamp:
 build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
 	dh_testdir
-	# Add here commands to compile the package.
 	$(MAKE) all
 	touch build-arch-stamp
 
 build-indep: configure-stamp  build-indep-stamp
 build-indep-stamp:
 	dh_testdir
-	# Add here command to compile/build the arch indep package.
-	# It's ok not to do anything here, if you don't need to build
-	#  anything for this package.
-	#/usr/bin/docbook-to-man debian/#PACKAGE#.sgml > #PACKAGE#.1
 	(cd docs; tar xzf html.tar.gz)
 	touch build-indep-stamp
 
@@ -57,21 +50,22 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
-	if [ -f Makefile ]; then $(MAKE) clean; fi
+	if [ -f Makefile -a -f config.status ]; then $(MAKE) clean; fi
 	find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
 	rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
 	# Ensure up-to-date versions of config.sub and config.guess
 	-test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess config.guess
+	-rm -f configure-stamp build-indep-stamp build-arch-stamp
+	-test -r Makefile && $(MAKE) clean
 	dh_clean
 
 install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
-	#
 	dh_installdirs -p $(pkg-help) $(ctsim-shared)
 	${MAKE} install
 	dh_installdirs -p $(pkg) $(pixmap-dir)
@@ -86,7 +80,6 @@ install: build
 	gunzip docs/ctsim.pdf.gz
 	chmod +x helical/*.sh tools/*.sh
 
-# Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
@@ -104,7 +97,6 @@ binary-indep: build install
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
@@ -117,8 +109,8 @@ binary-arch: build install
 	dh_fixperms -a
 	dh_installmenu -a
 	dh_installdeb -a
-	dh_gencontrol -a
 	dh_shlibdeps -a
+	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a