From dd13d5775af0d79d92e30c21cea69f2802e2bcf1 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 23 Nov 2010 19:28:03 +0000 Subject: ocaml: install built modules Previously the install target was having no effect because it ended up calling the default target in the subdir Makefile instead of the install target. Resolve this by tying the tools/ocaml Makefiles into the generic handling done by tools/Rules.mk. Other changes arising in one way or another from this: - Add libs/xl/META.in - Update .hgignore for META files - Create leading directories - Remove existing module before installation in install targer (worksaround what appears to be a quirk of "ocamlfind install") - Use the globally defined $(DESTDIR) - Move "ocamlfind printfconf destdir" to a common variable, repurposing exising unused OCAMLDESTDIR, incorporating $(DESTDIR) at the same time. - Drop a few unused variabe definitions (mainly to avoid deciding if $(DESTDIR) made sense for them or not. - Pass -destdir to ocamlfind in uninstall target for symmetry with install target. Signed-off-by: Ian Campbell Signed-off-by: Ian Jackson --- .hgignore | 1 + 1 file changed, 1 insertion(+) (limited to '.hgignore') diff --git a/.hgignore b/.hgignore index 865da6dc4c..3fac70041f 100644 --- a/.hgignore +++ b/.hgignore @@ -292,6 +292,7 @@ ^tools/ioemu-dir$ ^tools/ocaml/.*/.*\.annot$ ^tools/ocaml/.*/.*\.cmx?a$ +^tools/ocaml/.*/META$ ^tools/ocaml/.*/\.ocamldep\.make$ ^tools/ocaml/xenstored/oxenstored$ ^xen/\.banner.*$ -- cgit v1.2.3