[Pkg-ocaml-maint-commits] r2275 - trunk/packages/ocaml/trunk/debian

[Julien Cristau]

Author: jcristau-guest
Date: 2005-12-09 10:06:36 +0000 (Fri, 09 Dec 2005)
New Revision: 2275

Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/rules
Log:
Fix debian/rules for non-native arches, which I broke in 3.09.0-2. Sorry for this :(


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-12-09 08:25:12 UTC (rev 2274)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-12-09 10:06:36 UTC (rev 2275)
@@ -1,3 +1,10 @@
+ocaml (3.09.0-3) unstable; urgency=low
+
+  * Fix build on non-native arches which was broken by the changes to
+    debian/rules in the previous release. Sorry for this :(
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Fri,  9 Dec 2005 11:01:06 +0100
+
 ocaml (3.09.0-2) unstable; urgency=low
 
   * Modified debian/rules to exit with an error when native compiler build

Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules	2005-12-09 08:25:12 UTC (rev 2274)
+++ trunk/packages/ocaml/trunk/debian/rules	2005-12-09 10:06:36 UTC (rev 2275)
@@ -74,12 +74,11 @@
 	fi
 	$(MAKE) world
 	$(MAKE) bootstrap
-ifeq (,$(shell grep "ARCH=none" config/Makefile))
-	@echo "Building native compilers"
-	$(MAKE) opt
-	$(MAKE) opt.opt
-	touch opt-built-stamp
-endif
+	if ! grep -q "ARCH=none" config/Makefile; then \
+		echo "Building native compilers" && \
+		$(MAKE) opt opt.opt && \
+		touch opt-built-stamp; \
+	fi
 	if [ -x ./ocamlopt ]; then					\
 		$(MAKE) -C debian/ocaml-md5sums opt;			\
 	else								\