From: Anil Madhavapeddy <anil@recoil.org>
Date: Wed, 4 Nov 2009 20:50:54 +0000 (+0000)
Subject: Explicitly include the ocaml install location in the Makefile so that it works with... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=37c55f2757f5289b2bcb912033e5493ae00b5d61;p=xcp%2Fxen-api-libs.git

Explicitly include the ocaml install location in the Makefile so that it works with installs outside the search path also (e.g. MacPorts)

Signed-off-by: Anil Madhavapeddy <anil@recoil.org>
---

diff --git a/stdext/Makefile b/stdext/Makefile
index ab94abf..fd0edd6 100644
--- a/stdext/Makefile
+++ b/stdext/Makefile
@@ -1,6 +1,7 @@
 IPROG=install -m 755 -o root -g root
 CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml
+OCAMLLOC := $(shell ocamlc -where)
+CFLAGS = -Wall -fPIC -O2 -I/opt/xensource/lib/ocaml -I$(OCAMLLOC)
 OCAMLC = ocamlc -g
 OCAMLOPT = ocamlopt
 
@@ -11,8 +12,8 @@ DESTDIR ?= /
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
-OCAMLABI := $(shell ocamlc -version)
-OCAMLLIBDIR := $(shell ocamlc -where)
+OCAMLABI := $(OCAMLLOC)
+OCAMLLIBDIR := $(OCAMLLOC)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
 
 OCAML_TEST_INC = -I $(shell ocamlfind query oUnit)