Permalink
Browse files

Import patch 0022-new-ocaml-layout.patch

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
  • Loading branch information...
1 parent dbd1565 commit 22289badc2f838225a080a0b532bb59a5782b213 @jonludlam jonludlam committed Nov 9, 2012
Showing with 11 additions and 3 deletions.
  1. +9 −1 Makefile
  2. +1 −1 ocaml/idl/OMakefile
  3. +1 −1 ocaml/idl/ocaml_backend/OMakefile
View
@@ -43,6 +43,10 @@ XHADIR=/opt/xensource/xha
BINDIR=/usr/lib/xcp/bin
SBINDIR=/usr/sbin
UDEVDIR=/lib/udev
+
+OCAMLPATH=/usr/lib/xen-4.1/lib/ocaml:/usr/lib/ocaml/xcp
+EXTRA_INSTALL_PATH=/xcp
+
else
VARDIR=/var/xapi
VARPATCHDIR=/var/patch
@@ -61,10 +65,14 @@ XHADIR=/opt/xensource/xha
BINDIR=/opt/xensource/bin
SBINDIR=/opt/xensource/bin
UDEVDIR=/etc/udev
+
+OCAMLPATH=
+EXTRA_INSTALL_PATH=
+
endif
-export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF RRDDCONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR SBINDIR UDEVDIR
+export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF RRDDCONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR SBINDIR UDEVDIR OCAMLPATH EXTRA_INSTALL_PATH
.PHONY: all
all: version ocaml/fhs.ml
View
@@ -103,7 +103,7 @@ META: META.in
sed 's/@VERSION@/$(PRODUCT_VERSION)/g' < $< > $@
if $(defined-env DESTDIR)
- INSTALL_PATH = $(DESTDIR)/$(shell ocamlc -where)
+ INSTALL_PATH = $(DESTDIR)/$(shell ocamlc -where)$(EXTRA_INSTALL_PATH)
export
else
INSTALL_PATH = $(shell ocamlfind printconf destdir)
@@ -155,7 +155,7 @@ META: META.in
sed 's/@VERSION@/$(PRODUCT_VERSION)/g' < $< > $@
if $(defined-env DESTDIR)
- INSTALL_PATH = $(DESTDIR)/$(shell ocamlc -where)
+ INSTALL_PATH = $(DESTDIR)/$(shell ocamlc -where)$(EXTRA_INSTALL_PATH)
export
else
INSTALL_PATH = $(shell ocamlfind printconf destdir)

0 comments on commit 22289ba

Please sign in to comment.