X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=mlvirsh%2FMakefile.in;h=197f732fe793d7070962c2de4a9aea9a5411bff0;hp=6976e166c679dcfb8645ed7696f74714ad4f21f3;hb=d51d46594f6c4dfcfa43f623ab592b4f05132810;hpb=3126bfee333b5c635dc60a54265936af06117f6a

diff --git a/mlvirsh/Makefile.in b/mlvirsh/Makefile.in
old mode 100755
new mode 100644
index 6976e16..197f732
--- a/mlvirsh/Makefile.in
+++ b/mlvirsh/Makefile.in
@@ -21,13 +21,23 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 
-OCAMLCPACKAGES	:= -package extlib,unix -I ../libvirt
+OCAMLFIND	= @OCAMLFIND@
+
+ifneq ($(OCAMLFIND),)
+OCAMLCPACKAGES	:= -package unix -I ../libvirt
 OCAMLCFLAGS	:= -g
 OCAMLCLIBS	:= -linkpkg
-
 OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
 OCAMLOPTFLAGS	:=
 OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+else
+OCAMLCINCS	:= -I ../libvirt
+OCAMLCFLAGS	:= -g
+OCAMLCLIBS	:= unix.cma
+OCAMLOPTINCS	:= $(OCAMLCINCS)
+OCAMLOPTFLAGS	:=
+OCAMLOPTLIBS	:= unix.cmxa
+endif
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
@@ -39,14 +49,25 @@ all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
+ifneq ($(OCAMLFIND),)
 mlvirsh: mlvirsh.cmo
-	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
 	  ../libvirt/mllibvirt.cma -o $@ $<
 
 mlvirsh.opt: mlvirsh.cmx
-	ocamlfind ocamlopt \
+	$(OCAMLFIND) ocamlopt \
 	  $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
 	  ../libvirt/mllibvirt.cmxa -o $@ $<
+else
+mlvirsh: mlvirsh.cmo
+	$(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  ../libvirt/mllibvirt.cma -o $@ $<
+
+mlvirsh.opt: mlvirsh.cmx
+	$(OCAMLOPT) \
+	  $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
+	  ../libvirt/mllibvirt.cmxa -o $@ $<
+endif
 
 install:
 	if [ -x mlvirsh.opt ]; then \