[Pkg-apache-commits] r1221 - in /trunk/apache2: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Tue Aug 17 14:12:30 2010
New Revision: 1221

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1221
Log:
Force -j1 for 'make install' to fix occasional FTBFS. Closes: #593036

Modified:
    trunk/apache2/changelog
    trunk/apache2/rules

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1221&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Aug 17 14:12:30 2010
@@ -1,5 +1,6 @@
 apache2 (2.2.16-2) UNRELEASED; urgency=low
 
+  * Force -j1 for 'make install' to fix occasional FTBFS. Closes: #593036
   * If the init script's reload action is called immediately after the start
     action, wait a bit to allow apache2 to start and register its signal
     handlers. Closes: #589386, LP: #603192

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1221&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Tue Aug 17 14:12:30 2010
@@ -159,8 +159,9 @@
 install-worker: mpm-worker
 	dh_testdir
 	dh_testroot
+	# force one process since mkdir.sh used by 'make install' is not reliable otherwise
 	cd $(BUILD)/worker ;\
-	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp install
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp -j 1 install
 	for m in logresolve ab; do d=$(REALCURDIR)/debian/tmp/usr/share/man/ ;\
 	    perl -p -e 's/^([.]TH.*?) 8 (.*)/$$1 1 $$2/' < $$d/man8/$$m.8 > $$d/man1/$$m.1 ;\
 	done
@@ -169,8 +170,9 @@
 install-prefork: mpm-prefork
 	dh_testdir
 	dh_testroot
+	# force one process since mkdir.sh used by 'make install' is not reliable otherwise
 	cd $(BUILD)/prefork ;\
-	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp-prefork install
+	$(MAKE) DESTDIR=$(REALCURDIR)/debian/tmp-prefork -j 1 install
 
 install-dev: install-worker install-prefork
 	dh_testdir