X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=7bfcfea8f151a08280d7e0d83ca4bbbd7062822d;hb=ff0f60e1254a26de7c3f8153a53df78ce9909483;hp=9d376e8cf97b02470471898400b8c9913ae82d62;hpb=4b497903ff4bc4d4eb4aeab52f078a0ca343686a;p=ctsim.git

diff --git a/debian/rules b/debian/rules
index 9d376e8..7bfcfea 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
@@ -9,7 +7,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-host_arch	:= $(dpkg-architecture -qDEB_HOST_ARCH)
+host_arch	:= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg		:= ctsim
 pkg-p4		:= ctsim-pentium4
@@ -30,7 +28,7 @@ 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
 
 
 configure: configure-stamp
@@ -79,10 +77,10 @@ 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
@@ -93,8 +91,10 @@ ifneq (,$(findstring i386,$(host_arch)))
 	./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-p3) $(pixmap-dir)
 	dh_installdirs -p $(pkg-p4) $(pixmap-dir)
 	dh_installdirs -p $(pkg-athlon) $(pixmap-dir)
+	dh_install -p $(pkg-p3) debian/ctsim.xpm $(pixmap-dir)
 	dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir)
 	dh_install -p $(pkg-athlon) debian/ctsim.xpm $(pixmap-dir)
 endif
@@ -143,29 +143,48 @@ binary-arch: build install
 	dh_testroot -a
 #	dh_installdebconf -a
 	dh_installdocs -a
-	dh_installexamples -a tools/sample-ctsim.sh helical/sample-helical.sh
-	dh_installmenu -a
+	dh_installexamples -p $(pkg) tools/sample-ctsim.sh helical/sample-helical.sh
+ifneq (,$(findstring i386,$(host_arch)))
+	dh_installexamples -p $(pkg-p3) tools/sample-ctsim.sh helical/sample-helical.sh
+	dh_installexamples -p $(pkg-p4) tools/sample-ctsim.sh helical/sample-helical.sh
+	dh_installexamples -p $(pkg-athlon) tools/sample-ctsim.sh helical/sample-helical.sh
+endif
 #	dh_installlogrotate -a
 #	dh_installemacsen -a
 #	dh_installpam -a
 #	dh_installmime -a
 #	dh_installinit -a
-	dh_installcron -a
+#	dh_installcron -a
 #	dh_installman -a
-	dh_installinfo -a
+#	dh_installinfo -a
 #	dh_undocumented -a
+#	dh_makeshlibs -a
+#	dh_perl -a
+ifeq (,$(findstring i386,$(host_arch)))
+	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)
+else
 	dh_installchangelogs ChangeLog -a
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-#	dh_makeshlibs -a
+	dh_installmenu -a
 	dh_installdeb -a
-#	dh_perl -a
-	dh_shlibdeps -a
 	dh_gencontrol -a
+	dh_shlibdeps -a
 	dh_md5sums -a
 	dh_builddeb -a
+endif
 
 binary: binary-indep binary-arch