From: Julien Cristau <julien.cristau@ens-lyon.org>
Date: Thu, 10 Nov 2005 15:44:04 +0000 (+0000)
Subject: Modified debian/rules to exit with an error when native compiler build
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~694
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=85fb6f954714278b45b2bed9a823db3d020c7970;p=ocaml.git

Modified debian/rules to exit with an error when native compiler build
fails, instead of building a broken package.
---

diff --git a/debian/changelog b/debian/changelog
index 1490df83..387f0660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (3.09.0-2) unstable; urgency=low
+
+  * Modified debian/rules to exit with an error when native compiler build
+    fails, instead of building a broken package.
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Thu, 10 Nov 2005 16:39:42 +0100
+
 ocaml (3.09.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index ac16b4f8..07f0c727 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,16 +72,18 @@ build-arch-stamp: patch-stamp config-stamp
 	if test ! -d boot.debian; then 					\
 		cp -xa boot boot.debian;				\
 	fi
-	$(MAKE) world bootstrap
-	if test -z `grep "ARCH=none" config/Makefile`;then		\
-		echo "Building native compilers";			\
-		$(MAKE) opt opt.opt;					\
-		touch opt-built-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 [ -x ./ocamlopt ]; then					\
-		$(MAKE) -C debian/ocaml-md5sums opt;				\
+		$(MAKE) -C debian/ocaml-md5sums opt;			\
 	else								\
-		$(MAKE) -C debian/ocaml-md5sums all;				\
+		$(MAKE) -C debian/ocaml-md5sums all;			\
 	fi
 	touch build-arch-stamp