3a710a0c04
- This is not the latest version, but this step lubricates coming next phase of our OCaml stack update - Since we're post-4.06 now, remove support for Num library which is a separate port/package - Detect optionally installed libraries and adjust the packaging list accordingly - Spell `Tk' correctly in the TOOLBOX option description PR: 238904, 262791
42 lines
2.3 KiB
Text
42 lines
2.3 KiB
Text
--- src/findlib/Makefile.orig 2016-11-18 13:04:46 UTC
|
|
+++ src/findlib/Makefile
|
|
@@ -19,6 +19,7 @@ OCAMLDEP = ocamldep
|
|
OCAMLLEX = ocamllex
|
|
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo --
|
|
#CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo --
|
|
+OCAML_LIBBIN=${PREFIX}/lib/ocaml
|
|
|
|
|
|
OBJECTS = findlib_config.cmo fl_split.cmo fl_metatoken.cmo fl_meta.cmo \
|
|
@@ -119,23 +120,23 @@ clean:
|
|
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
|
|
|
|
install: all
|
|
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
|
|
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
|
|
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
|
|
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
|
|
files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
|
|
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
|
|
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
|
|
- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
|
|
+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
|
|
# the following "if" block is only needed for 4.00beta2
|
|
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
|
|
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
|
|
- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
|
|
+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
|
|
fi
|
|
|
|
install-num-top:
|
|
- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
|
|
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
|
|
cp num_top.cma num_top.cmi num_top_printers.cmi \
|
|
- "$(prefix)$(OCAML_SITELIB)/num-top"
|
|
+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
|
|
|
|
# Note: uninstall-num-top is part of the removal of the META files.
|
|
|