Patch subject is complete summary.

 cdrom/Makefile |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


# HG changeset patch
# User Mike McClurg <[email protected]>
# Date 1295623661 0
# Node ID b8d9204d50e0ce9b1be155753abb7f66028ded55
# Parent  9f9a6fb8d4e5375cc0b341c2bb8b28d3c85bc9ae
imported patch cdrom-makefile

diff --git a/cdrom/Makefile b/cdrom/Makefile
--- a/cdrom/Makefile
+++ b/cdrom/Makefile
@@ -1,8 +1,3 @@
-CC = gcc
-CFLAGS = -Wall -fPIC -O2 -I/usr/lib/ocaml
-OCAMLC = ocamlc -g
-OCAMLOPT = ocamlopt
-
 LDFLAGS = -cclib -L./
 
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
@@ -12,6 +7,11 @@
 OCAMLLIBDIR := $(shell ocamlc -where)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
 
+CC = gcc
+CFLAGS = -Wall -fPIC -O2 -I$(OCAMLLIBDIR)
+OCAMLC = ocamlc -g
+OCAMLOPT = ocamlopt
+
 OBJS = cdrom
 INTF = $(foreach obj, $(OBJS),$(obj).cmi)
 LIBS = cdrom.cma cdrom.cmxa
@@ -65,7 +65,6 @@
 .PHONY: doc
 doc: $(INTF)
 	python ../doc/doc.py $(DOCDIR) "cdrom" "package" "$(OBJS)" "." "" ""
-	
+
 clean:
 	rm -f *.o *.so *.a *.cmo *.cmi *.cma *.cmx *.cmxa *.annot $(LIBS) $(PROGRAMS)
-
_______________________________________________
xen-api mailing list
[email protected]
http://lists.xensource.com/mailman/listinfo/xen-api

Reply via email to