From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Fri, 9 Dec 2005 10:06:36 +0000 (+0000)
Subject: Fix debian/rules for non-native arches, which I broke in 3.09.0-2. Sorry for this :(
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~689
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=40f2f9a378fcf3b4e12e94a9394357dd4b5432ca;p=ocaml.git

Fix debian/rules for non-native arches, which I broke in 3.09.0-2. Sorry for this :(
---

diff --git a/debian/changelog b/debian/changelog
index 9d5e4935..07de0561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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
diff --git a/debian/rules b/debian/rules
index 206777bc..ff317199 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,12 +74,11 @@ build-arch-stamp: patch-stamp config-stamp
 	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								\