debian/changelog | 8 ++++++++ debian/rules | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
New commits: commit c14446ab00a2e046c0641314e0ce2ee02ed99974 Author: Julien Cristau <[email protected]> Date: Fri Sep 4 17:22:31 2009 +0200 Don't run install from the various configs in parallel Hopefully this fixes a bug in the previous debian/rules that could lead to FTBFS. Thanks to Bernhard R. Link for the suggestions. diff --git a/debian/changelog b/debian/changelog index faed851..a79e71a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mesa (7.5.1-2) UNRELEASED; urgency=low + + * Don't run install from the various configs in parallel, hopefully fixing a + bug in the previous debian/rules. Thanks to Bernhard R. Link for the + suggestions. + + -- Julien Cristau <[email protected]> Fri, 04 Sep 2009 17:19:57 +0200 + mesa (7.5.1-1) unstable; urgency=low [ Brice Goglin ] diff --git a/debian/rules b/debian/rules index 7042fe1..0d6386f 100755 --- a/debian/rules +++ b/debian/rules @@ -187,16 +187,15 @@ $(STAMP)-build-%: configure touch $@ -install: +install: build # Add here commands to install the package into debian/tmp dh_testdir dh_testroot dh_clean -k dh_installdirs - $(MAKE) -f debian/rules $(INSTALL_TARGETS) - -install-%: $(STAMP)-build-% - cd $(DEB_BUILD_DIR)/$* && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + set -e; for config in $(CONFIGS); do \ + $(MAKE) -C $(DEB_BUILD_DIR)/$$config DESTDIR=$(CURDIR)/debian/tmp install; \ + done clean: unpatch dh_testdir -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
