X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=ocaml%2FMakefile.am;h=ca4c111f1f47dbf7130e7a6315b1f2b572e3cb7e;hb=534a0aed6e40818bb2cb354bcf2fd3b587bce2cd;hp=e61b5dba18fc242308a8c2ffc407560c09e7b863;hpb=2cf6eef8ff7b7ab642943e67183f0d7491c69f9d;p=hivex.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index e61b5db..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,13 +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 *.cmx *.cmxa *.cmi *.mli
+	  $(PACKAGE_NAME) \
+	  $(install_files)
 
 CLEANFILES += $(noinst_DATA)