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 9d5e493509b49a740c459640b7a0ccd959a47ec5..07de05615593ae9672aa63b5a1f8d9a903018806 100644 (file)
--- 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 206777bcca5371ad7e23bdf0ea9bdaf3f8e05bd7..ff317199a09915a55680dfc7083acd4e24957e0d 100755 (executable)
--- 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                                                            \