[Pkg-ocaml-maint-commits] [SCM] jocaml packaging branch, master, updated. debian/3.11.1-1-10-gc1c2100

Mehdi Dogguy mehdi at debian.org
Tue Sep 22 18:36:37 UTC 2009


The following commit has been merged in the master branch:
commit 1e8e78455800dbfd85df7f4aa313e8f4b8ebab10
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Sep 22 16:58:38 2009 +0200

    Use /usr/share/misc/config.{sub,guess} when available to fix FTBFS on avr32 (Closes: #538049).

diff --git a/debian/changelog b/debian/changelog
index 11d89f5..f43c1f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jocaml (3.11.1-2) unstable; urgency=low
 
   * Fix bashim in debian/jocamlmktop and add a copyright notice
     (Closes: #547748).
+  * Use /usr/share/misc/config.{sub,guess} when available to fix FTBFS
+    on avr32 (Closes: #538049).
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Thu, 09 Jul 2009 19:09:54 +0200
 
diff --git a/debian/rules b/debian/rules
index c843fc3..dc9cd88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,11 @@ OCAMLINIT_SED += -e 's%@JOCamlStdlibDir@%$(JOCAML_STDLIB_DIR)%g'
 OCAMLC := $(if $(wildcard /usr/bin/ocamlc.opt),/usr/bin/ocamlc.opt,/usr/bin/ocamlc)
 
 override_dh_auto_configure: ocamlinit
+	for ext in sub guess; do \
+		if [ -f /usr/share/misc/config.$$ext ]; then \
+			cp -f /usr/share/misc/config.$$ext $(CURDIR)/config.$$ext; \
+		fi; \
+	done
 	./configure --prefix /usr     \
 	--libdir $(JOCAML_STDLIB_DIR) \
 	--mandir /usr/share/man       \

-- 
jocaml packaging



More information about the Pkg-ocaml-maint-commits mailing list