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 1490df83572b75134b26a4de3ed98abb2514ac5c..387f066000e6ca33ef4ec49cf974d11ee3cc32c0 100644 (file)
--- 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 ac16b4f84ed04b5825cc47b774ac7716ab74a342..07f0c72731513802e930a642b5f9c26468d3eae1 100755 (executable)
--- 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