[Pkg-ocaml-maint-commits] [SCM] cairo-ocaml packaging branch, master, updated. debian/20090223-5-10-g3e26f12

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 97092e7a67174469b02185c1842a29a91814de23
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 2 15:36:25 2011 +0200

    Fix Makefile to avoid recompiling files in /usr

diff --git a/debian/patches/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch b/debian/patches/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
new file mode 100644
index 0000000..fcb0f05
--- /dev/null
+++ b/debian/patches/0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 2 Aug 2011 15:34:21 +0200
+Subject: Fix Makefile to avoid recompiling files in /usr
+
+The "-I /path/to/lablgtk2" option should not be used when calling
+ocamldep, otherwise files there are considered as possible targets by
+the build system.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 46a62f6..c9c64b7 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -117,7 +117,7 @@ clean :
+ 
+ .depend : $(wildcard *.ml *.mli)
+ 	@echo "making deps"
+-	@$(OCAMLDEP) $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $^ > $@
++	@$(OCAMLDEP) $^ > $@
+ 
+ -include .depend
+ -include .depend_c
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 1053e7d..180482f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-missing-libraries-used-by-the-stubs-to-CAIRO_LIB.patch
+0002-Fix-Makefile-to-avoid-recompiling-files-in-usr.patch

-- 
cairo-ocaml packaging