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

[Julien Cristau]

Author: jcristau-guest
Date: 2005-11-10 15:44:04 +0000 (Thu, 10 Nov 2005)
New Revision: 1983

Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/rules
Log:
Modified debian/rules to exit with an error when native compiler build
fails, instead of building a broken package.


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-11-10 09:31:07 UTC (rev 1982)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-11-10 15:44:04 UTC (rev 1983)
@@ -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 at ens-lyon.org>  Thu, 10 Nov 2005 16:39:42 +0100
+
 ocaml (3.09.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml/trunk/debian/rules	2005-11-10 09:31:07 UTC (rev 1982)
+++ trunk/packages/ocaml/trunk/debian/rules	2005-11-10 15:44:04 UTC (rev 1983)
@@ -72,16 +72,18 @@
 	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