[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. 8c1d3e4ac8f36437940b371d3b05af608276b985

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 8c1d3e4ac8f36437940b371d3b05af608276b985
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Jan 13 09:16:46 2010 -0600

    Fixed flexlink path

diff --git a/debian/Makefile-mingw32.in b/debian/Makefile-mingw32.in
index 1796563..3b938ff 100644
--- a/debian/Makefile-mingw32.in
+++ b/debian/Makefile-mingw32.in
@@ -53,7 +53,7 @@ SYSTHREAD_SUPPORT=true
 PARTIALLD=i586-mingw32msvc-ld -r
 PACKLD=$(PARTIALLD) $(NATIVECCLINKOPTS) -o 
 DLLCCCOMPOPTS=
-IFLEXDIR=-I at libdir@/flexdll
+IFLEXDIR=-I at flexdir@
 O=o
 A=a
 SO=dll
diff --git a/debian/rules b/debian/rules
index caff338..b3d7d22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,6 +58,7 @@ stamp-prepare-cross-build: stamp-patch-mingw32-include
 	  -e "s, at bindir@,/usr/$(MINGW32_HOST)/bin,g" \
 	  -e "s, at libdir@,/usr/$(MINGW32_HOST)/lib/ocaml,g" \
 	  -e "s, at otherlibraries@,$(OTHER_LIBS),g" \
+	  -e "s, at flexdir@,$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR),g" \
 	  < debian/Makefile-mingw32.in > $(DEB_BUILDDIR)/$(OCAML_DIR)/config/Makefile
 	# We're going to build in otherlibs/win32unix and otherlibs/win32graph
 	# directories, but since they would normally only be built under
@@ -79,19 +80,21 @@ stamp-prepare-cross-build: stamp-patch-mingw32-include
 stamp-build-mingw32-ocaml:
 	# Just rebuild some small bits that we need for the following
 	# 'make opt' to work.  Note that 'make all' fails here.
-	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make -C byterun IFLEXDIR=-I$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR) libcamlrun.a
+	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make -C byterun libcamlrun.a
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make ocaml ocamlc
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make -C stdlib
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make -C tools ocamlmklib
 	# Build ocamlopt
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && PATH=$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR):$(PATH) \
-	                                   make IFLEXDIR=-I$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR) opt
+	                                   make opt
 	# Now build otherlibs for ocamlopt
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && \
 	for i in $(OTHER_LIBS); do \
 	  make -C otherlibs/$$i clean; \
-	  make -C otherlibs/$$i all; \
-	  make -C otherlibs/$$i allopt; \
+	  PATH=$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR):$(PATH) \
+	    make -C otherlibs/$$i all; \
+	  PATH=$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR):$(PATH) \
+	    make -C otherlibs/$$i allopt; \
 	done
 	touch stamp-build-mingw32-ocaml
 

-- 
mingw32-ocaml packaging