X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2FMakefile.am;h=ca4c111f1f47dbf7130e7a6315b1f2b572e3cb7e;hb=24e778286a2d684cb08afb29f5c0e48b2b312e7e;hp=58fa8e3af9eedfcc6b55e74ed33fbe63d5af96ad;hpb=f408b757b1d75429fae5fa7630a4fc5451844de7;p=hivex.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 58fa8e3..ca4c111 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -72,6 +72,7 @@ t/%: t/%.cmo mlhivex.cma
 .mli.cmi:
 	$(OCAMLFIND) ocamlc -package unix -c $< -o $@
 .ml.cmo:
+	mkdir -p `dirname $@`
 	$(OCAMLFIND) ocamlc -package unix -c $< -o $@
 .ml.cmx:
 	$(OCAMLFIND) ocamlopt -package unix -c $< -o $@
@@ -88,19 +89,19 @@ include .depend
 SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
 
 # Do the installation by hand, because we want to run ocamlfind.
+install_files = META *.so *.a *.cma *.cmi $(srcdir)/*.mli
+
+if HAVE_OCAMLOPT
+install_files += *.cmx *.cmxa
+endif
+
 install-data-hook:
 	mkdir -p $(DESTDIR)$(OCAMLLIB)
 	mkdir -p $(DESTDIR)$(OCAMLLIB)/stublibs
 	$(OCAMLFIND) install \
 	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
-	  hivex \
-	  META *.so *.a *.cma *.cmi *.mli
-if HAVE_OCAMLOPT
-	$(OCAMLFIND) install \
-	  -ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
-	  hivex \
-	  *.cmx *.cmxa
-endif
+	  $(PACKAGE_NAME) \
+	  $(install_files)
 
 CLEANFILES += $(noinst_DATA)