X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=debian%2Frules;h=0e73ff49be37fcb93707146205ef81cc8004ea7b;hb=a3ee46908ed9a56bc2234848d55ef753f179eb15;hp=1aa20200bd83d88fe36a939fede7211c6ea40e07;hpb=9fa95857cc6c2f1cb98cbfa7a176a213ec71c5ac;p=ctsim.git

diff --git a/debian/rules b/debian/rules
index 1aa2020..0e73ff4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ 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-stamp
 
 
@@ -44,6 +45,7 @@ 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
@@ -76,10 +78,10 @@ install: build
 	dh_installdirs
 	#
 	dh_installdirs -p $(pkg-help) $(ctsim-shared)
-	./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
-	$(MAKE) all
 	${MAKE} install
-ifeq ($(host_arch),i386)
+	#
+ifneq (,$(findstring i386,$(host_Arch)))
+	echo 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
@@ -90,14 +92,14 @@ ifeq ($(host_arch),i386)
 	./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon
 	$(MAKE) all
 	${MAKE} install
-endif
-	# Add here commands to install the package into debian/ctsim.
-	dh_installdirs -p $(pkg) $(pixmap-dir)
 	dh_installdirs -p $(pkg-p4) $(pixmap-dir)
 	dh_installdirs -p $(pkg-athlon) $(pixmap-dir)
-	dh_install -p $(pkg) 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
+	# Add here commands to install the package into debian/ctsim.
+	dh_installdirs -p $(pkg) $(pixmap-dir)
+	dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-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