X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=debian%2Frules;h=0678a20588750debc8a8bd81eea59d8c90b072c2;hp=9dd19a4fa53b7f6a5d09e7137fca3a60b58baa9a;hb=d20f7a2bf14365c2e3e1fac51f154f1ae761d08a;hpb=26fd30e45f8a9225c2bb411053ee3f80f55690af

diff --git a/debian/rules b/debian/rules
index 9dd19a4..0678a20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=4
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
 endif
@@ -13,7 +11,6 @@ host_arch	:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg		:= ctsim
 pkg-p4		:= ctsim-pentium4
-pkg-athlon	:= ctsim-athlon
 pkg-help	:= ctsim-help
 pkg-doc		:= ctsim-doc
 
@@ -21,23 +18,22 @@ ctsim-shared	:= usr/share/ctsim
 
 prefix		:= debian/$(pkg)
 prefix-p4	:= debian/$(pkg-p4)
-prefix-athlon	:= debian/$(pkg-athlon)
 prefix-help	:= debian/$(pkg-help)
 prefix-doc	:= debian/$(pkg-doc)
 
 DESTDIR		:= `pwd`/$(prefix)
 DESTDIR-P4	:= `pwd`/$(prefix-p4)
-DESTDIR-ATHLON	:= `pwd`/$(prefix-athlon)
 HELPDIR		:= `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir		:= usr/share/doc/$(pkg-doc)
-pixmap-dir	:= usr/X11R6/include/X11/pixmaps
-
+pixmap-dir	:= usr/share/pixmaps
+desktop-dir	:= usr/share/applications
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-	./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
+	touch configure.in && touch aclocal.m4 && touch configure
+
+	./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn -with-x
 	touch configure-stamp
 
 
@@ -68,6 +64,9 @@ clean:
 	-$(MAKE) distclean
 	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
 	dh_clean
 
 install: DH_OPTIONS=
@@ -79,28 +78,27 @@ install: build
 	#
 	dh_installdirs -p $(pkg-help) $(ctsim-shared)
 	${MAKE} install
-	echo Testing for i386 optimized builds
+	# Testing for i386 optimized builds
 	echo Host architecture is $(host_arch)
 ifneq (,$(findstring i386,$(host_arch)))
-	echo Building CPU-specific i386 flavors
+	# Building CPU-specific i386 flavors
 	# Pentium 4
 	${MAKE} clean
 	./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4
 	$(MAKE) all
 	${MAKE} install
-	# Athlon
-	${MAKE} clean
-	./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon
-	$(MAKE) all
-	${MAKE} install
+
 	dh_installdirs -p $(pkg-p4) $(pixmap-dir)
-	dh_installdirs -p $(pkg-athlon) $(pixmap-dir)
+	dh_installdirs -p $(pkg-p4) $(desktop-dir)
 	dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir)
-	dh_install -p $(pkg-athlon) debian/ctsim.xpm $(pixmap-dir)
+	dh_install -p $(pkg-p4) debian/ctsim.desktop $(desktop-dir)
+
 endif
 	# Add here commands to install the package into debian/ctsim.
 	dh_installdirs -p $(pkg) $(pixmap-dir)
+	dh_installdirs -p $(pkg) $(desktop-dir)
 	dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir)
+	dh_install -p $(pkg) debian/ctsim.desktop $(desktop-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
@@ -109,30 +107,20 @@ endif
 	gunzip docs/ctsim.pdf.gz
 	chmod +x helical/*.sh tools/*.sh
 
-# Build architecture-independent files here.
 # Pass -i to all debhelper commands in this target to reduce clutter.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installmenu -i
-#	dh_installlogrotate -i
-#	dh_installemacsen -i
-#	dh_installpam -i
-#	dh_installmime -i
-#	dh_installinit -i
 	dh_installcron -i
-#	dh_installman -i
 	dh_installinfo -i
-#	dh_undocumented -i
 	dh_installchangelogs ChangeLog -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-#	dh_perl -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -141,35 +129,22 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-#	dh_installdebconf -a
 	dh_installdocs -a
-	dh_installexamples -a tools/sample-ctsim.sh helical/sample-helical.sh
-	dh_installmenu -a
-#	dh_installlogrotate -a
-#	dh_installemacsen -a
-#	dh_installpam -a
-#	dh_installmime -a
-#	dh_installinit -a
-	dh_installcron -a
-#	dh_installman -a
-	dh_installinfo -a
-#	dh_undocumented -a
-	dh_installchangelogs ChangeLog -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-#	dh_makeshlibs -a
-	dh_installdeb -a
-#	dh_perl -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -p $(pkg)
+	dh_installexamples -p $(pkg) tools/sample-ctsim.sh helical/sample-helical.sh
 ifneq (,$(findstring i386,$(host_arch)))
-	dh_builddeb -p $(pkg-p4)
-	dh_builddeb -p $(pkg-athlon)
+	dh_installexamples -p $(pkg-p4) tools/sample-ctsim.sh helical/sample-helical.sh
 endif
+	dh_installchangelogs -p $(pkg) ChangeLog 
+	dh_strip -p $(pkg)
+	dh_link -p $(pkg)
+	dh_compress -p $(pkg)
+	dh_fixperms -p $(pkg)
+	dh_installmenu -p $(pkg)
+	dh_installdeb -p $(pkg)
+	dh_gencontrol -p $(pkg)
+	dh_shlibdeps -p $(pkg)
+	dh_md5sums -p $(pkg)
+	dh_builddeb -p $(pkg)
 
 binary: binary-indep binary-arch