The following commit has been merged in the master branch:
commit f65c0174b1aa31dfeed78cfeb7d38c4736f8bcb0
Author: Gerfried Fuchs <[email protected]>
Date: Wed Jun 2 13:29:33 2010 +0200
Really enable DEB_BUILD_OPTIONS="parallel=X"
diff --git a/debian/changelog b/debian/changelog
index bca36e4..2dfa634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wesnoth-1.8 (1:1.8.2-2) unstable; urgency=low
+
+ * Really enable DEB_BUILD_OPTIONS="parallel=X" in debian/rules.
+
+ --
+
wesnoth-1.8 (1:1.8.2-1) unstable; urgency=low
* New upstream stable release.
diff --git a/debian/rules b/debian/rules
index b41ba06..8154905 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,10 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
else
CFLAGS += -O2
endif
-## disabled for the time being again - debian/rules need to get rewritten
-## ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-## NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
-## MAKEFLAGS += -j$(NUMJOBS)
-## endif
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
# calculate the version strings
--
Debian packaging of wesnoth
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
