r10431 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2009-10-18 17:03:11 +0000 (Sun, 18 Oct 2009)
New Revision: 10431

Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/rules
Log:
Build/install the arch dep and indep stuff at the same time
to prevent race conditions with install/install-indep

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2009-10-18 16:53:38 UTC (rev 10430)
+++ packages/trunk/warzone2100/debian/changelog	2009-10-18 17:03:11 UTC (rev 10431)
@@ -2,8 +2,10 @@
 
   * New upstream release
   * Remove old configure options --with-opengl --with-ogg
+  * Build/install the arch dep and indep stuff at the same time
+    to prevent race conditions with install/install-indep
 
- -- Paul Wise <pabs at debian.org>  Sun, 18 Oct 2009 23:59:54 +0800
+ -- Paul Wise <pabs at debian.org>  Mon, 19 Oct 2009 01:02:22 +0800
 
 warzone2100 (2.2.3-1) unstable; urgency=low
 

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2009-10-18 16:53:38 UTC (rev 10430)
+++ packages/trunk/warzone2100/debian/rules	2009-10-18 17:03:11 UTC (rev 10431)
@@ -11,8 +11,6 @@
 	CROSS = --build $(DEB_BUILD_GNU_TYPE)
 endif
 
-SUBDIRS = $(shell sed -n 's/^ *SUBDIRS *= *\(.*\)/\1/;s/ po / /;s/ data / /p' Makefile.am)
-
 CFLAGS  = -Wall -g
 LDFLAGS = -Wl,-z,defs
 
@@ -52,31 +50,17 @@
 # -------------------------------------
 
 
-# Compile the binary
+# Compile the source
 # -------------------------------------
 build: build-stamp 
 
 build-stamp: config.status
 	dh_testdir
-	for d in $(SUBDIRS) ; do \
-		$(MAKE) -C $$d || exit 1 ; \
-	done 
+	$(MAKE)
 	touch $@
 # -------------------------------------
 
 
-# Build data files
-# -------------------------------------
-build-indep: build-indep-stamp
-
-build-indep-stamp: config.status
-	dh_testdir
-	$(MAKE) -C data
-	$(MAKE) -C po
-	touch $@
-# -------------------------------------
-
-
 # Clean source directory
 # -------------------------------------
 clean: clean-really
@@ -85,7 +69,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean
-	rm -f build-stamp build-indep-stamp
+	rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	-mv -f backup/*.po po/
 #	find -iname Makefile.in -print0 | xargs -0 rm -f
@@ -96,33 +80,20 @@
 # -------------------------------------
 
 
-# Install architecture-independent files
+# Install all files
 # -------------------------------------
-install-indep: build-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_prep -i
-	$(MAKE) -C data install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/tmp
-# -------------------------------------
-
-
-# Install architecture-dependent files
-# -------------------------------------
 install: build
-	dh_testdir -a
-	dh_testroot -a
-	dh_prep -a
-	for d in $(SUBDIRS) ; do \
-		$(MAKE) -C $$d install DESTDIR=$(CURDIR)/debian/tmp || exit 1 ; \
-	done
+	dh_testdir
+	dh_testroot
+	dh_prep
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	rm -rf debian/tmp/usr/share/doc/warzone2100
 # -------------------------------------
 
 
 # Build architecture-independent files
 # -------------------------------------
-binary-indep: build-indep install-indep
+binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdirs -i
@@ -162,4 +133,4 @@
 
 
 binary: binary-indep binary-arch
-.PHONY: configure build build-indep clean clean-really binary-indep binary-arch binary install install-indep
+.PHONY: configure build clean clean-really binary-indep binary-arch binary install