Wed Nov 30 13:46:14 2016 UTC ()
Updated ocaml-findlib to 1.7.1.

Fix man page installation.

Changes:

1.7.1:
added missing file to tarball

1.7.0:
New command "ocamlfind printppx" that outputs
how the ppx preprocessor would be called (Hendrik Tews).

Support for the raw_spacetime library that comes with
OCaml 4.04 (Gerd Stolpmann with help from Mark Shinwell).

Require that ocamlc and ocamlc.opt are installed to the
same directory for emitting the "opt" setting in the generated
config file - same for ocamlopt.opt, ocamldep.opt, ocamldoc.opt.


(wiz)
diff -r1.29 -r1.30 pkgsrc/devel/ocaml-findlib/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/ocaml-findlib/PLIST
diff -r1.14 -r1.15 pkgsrc/devel/ocaml-findlib/distinfo
diff -r1.4 -r1.5 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
cvs diff -r1.29 -r1.30 pkgsrc/devel/ocaml-findlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/Makefile 2016/06/25 13:55:15 1.29
+++ pkgsrc/devel/ocaml-findlib/Makefile 2016/11/30 13:46:14 1.30
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.29 2016/06/25 13:55:15 jaapb Exp $ 1# $NetBSD: Makefile,v 1.30 2016/11/30 13:46:14 wiz Exp $
2 2
3DISTNAME= findlib-1.6.2 3DISTNAME= findlib-1.7.1
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://download.camlcity.org/download/ 6MASTER_SITES= http://download.camlcity.org/download/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://www.camlcity.org/ 9HOMEPAGE= http://www.camlcity.org/
11COMMENT= Library finder for OCaml 10COMMENT= Library finder for OCaml
12LICENSE= mit 11LICENSE= mit
13 12
14OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib graphics \ 13OCAML_FINDLIB_DIRS+= bigarray bytes compiler-libs dynlink findlib graphics \
15 ocamldoc num-top num stdlib str threads unix 14 ocamldoc num-top num stdlib str threads unix
16 15
17.include "../../mk/ocaml.mk" 16.include "../../mk/ocaml.mk"
18 17
cvs diff -r1.11 -r1.12 pkgsrc/devel/ocaml-findlib/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/PLIST 2016/06/25 13:55:15 1.11
+++ pkgsrc/devel/ocaml-findlib/PLIST 2016/11/30 13:46:14 1.12
@@ -1,45 +1,48 @@ @@ -1,45 +1,48 @@
1@comment $NetBSD: PLIST,v 1.11 2016/06/25 13:55:15 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.12 2016/11/30 13:46:14 wiz Exp $
2bin/ocamlfind 2bin/ocamlfind
3${OCAML_SITELIB}/bigarray/META 3${OCAML_SITELIB}/bigarray/META
4${OCAML_SITELIB}/bytes/META 4${OCAML_SITELIB}/bytes/META
5${OCAML_SITELIB}/compiler-libs/META 5${OCAML_SITELIB}/compiler-libs/META
6${OCAML_SITELIB}/dynlink/META 6${OCAML_SITELIB}/dynlink/META
7${OCAML_SITELIB}/findlib/META 7${OCAML_SITELIB}/findlib/META
8${OCAML_SITELIB}/findlib/Makefile.config 8${OCAML_SITELIB}/findlib/Makefile.config
9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a 9${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.a
10${OCAML_SITELIB}/findlib/findlib.cma 10${OCAML_SITELIB}/findlib/findlib.cma
11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa 11${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxa
12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs 12${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib.cmxs
13${OCAML_SITELIB}/findlib/findlib.cmi 13${OCAML_SITELIB}/findlib/findlib.cmi
14${OCAML_SITELIB}/findlib/findlib.mli 14${OCAML_SITELIB}/findlib/findlib.mli
15${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.a 15${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.a
16${OCAML_SITELIB}/findlib/findlib_dynload.cma 16${OCAML_SITELIB}/findlib/findlib_dynload.cma
17${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxa 17${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxa
18${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxs 18${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxs
 19${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.a
19${OCAML_SITELIB}/findlib/findlib_top.cma 20${OCAML_SITELIB}/findlib/findlib_top.cma
 21${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.cmxa
 22${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.cmxs
20${OCAML_SITELIB}/findlib/fl_dynload.cmi 23${OCAML_SITELIB}/findlib/fl_dynload.cmi
21${OCAML_SITELIB}/findlib/fl_dynload.mli 24${OCAML_SITELIB}/findlib/fl_dynload.mli
22${OCAML_SITELIB}/findlib/fl_metascanner.cmi 25${OCAML_SITELIB}/findlib/fl_metascanner.cmi
23${OCAML_SITELIB}/findlib/fl_metascanner.mli 26${OCAML_SITELIB}/findlib/fl_metascanner.mli
24${OCAML_SITELIB}/findlib/fl_metatoken.cmi 27${OCAML_SITELIB}/findlib/fl_metatoken.cmi
25${OCAML_SITELIB}/findlib/fl_package_base.cmi 28${OCAML_SITELIB}/findlib/fl_package_base.cmi
26${OCAML_SITELIB}/findlib/fl_package_base.mli 29${OCAML_SITELIB}/findlib/fl_package_base.mli
27${OCAML_SITELIB}/findlib/topfind.cmi 30${OCAML_SITELIB}/findlib/topfind.cmi
28${OCAML_SITELIB}/findlib/topfind.mli 31${OCAML_SITELIB}/findlib/topfind.mli
29${OCAML_SITELIB}/graphics/META 32${OCAML_SITELIB}/graphics/META
30${OCAML_SITELIB}/ocamldoc/META 33${OCAML_SITELIB}/ocamldoc/META
31${OCAML_SITELIB}/num-top/META 34${OCAML_SITELIB}/num-top/META
32${OCAML_SITELIB}/num-top/num_top.cma 35${OCAML_SITELIB}/num-top/num_top.cma
33${OCAML_SITELIB}/num-top/num_top.cmi 36${OCAML_SITELIB}/num-top/num_top.cmi
34${OCAML_SITELIB}/num-top/num_top_printers.cmi 37${OCAML_SITELIB}/num-top/num_top_printers.cmi
35${OCAML_SITELIB}/num/META 38${OCAML_SITELIB}/num/META
36${OCAML_SITELIB}/stdlib/META 39${OCAML_SITELIB}/stdlib/META
37${OCAML_SITELIB}/str/META 40${OCAML_SITELIB}/str/META
38${OCAML_SITELIB}/threads/META 41${OCAML_SITELIB}/threads/META
39${OCAML_SITELIB}/unix/META 42${OCAML_SITELIB}/unix/META
40lib/ocaml/topfind 43lib/ocaml/topfind
41@comment man/man1/ocamlfind.1 44man/man1/ocamlfind.1
42@comment man/man5/META.5 45man/man5/META.5
43@comment man/man5/findlib.conf.5 46man/man5/findlib.conf.5
44@comment man/man5/site-lib.5 47man/man5/site-lib.5
45share/examples/ocaml-findlib/ocamlfind.conf 48share/examples/ocaml-findlib/ocamlfind.conf
cvs diff -r1.14 -r1.15 pkgsrc/devel/ocaml-findlib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/distinfo 2016/05/05 09:42:19 1.14
+++ pkgsrc/devel/ocaml-findlib/distinfo 2016/11/30 13:46:14 1.15
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.14 2016/05/05 09:42:19 jaapb Exp $ 1$NetBSD: distinfo,v 1.15 2016/11/30 13:46:14 wiz Exp $
2 2
3SHA1 (findlib-1.6.2.tar.gz) = 25da312f0a0013fe04ebe0577594e8bc9e7f5d64 3SHA1 (findlib-1.7.1.tar.gz) = 5cde7077341a3ff9de7a625383f369b1e1d61fd3
4RMD160 (findlib-1.6.2.tar.gz) = b6d448a5266254b3bfeceb8ca445e454291007fb 4RMD160 (findlib-1.7.1.tar.gz) = 2d4dca216c58214e102ab35f604607d91a6f6c89
5SHA512 (findlib-1.6.2.tar.gz) = 8c4098e6956530bc88d20a1b91512c68368e8a866398ce4d504afe3f71e81124c01644ba31ff97da6e61e7410328b533fb1d31a513166231047dab1933179fc4 5SHA512 (findlib-1.7.1.tar.gz) = 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
6Size (findlib-1.6.2.tar.gz) = 253764 bytes 6Size (findlib-1.7.1.tar.gz) = 256883 bytes
7SHA1 (patch-Makefile) = c1688615027f5f0f67a738c15ddd44a31a77ffdf 7SHA1 (patch-Makefile) = 7d427be437e4ec2fb50feba8dee7d2759506267b
8SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881 8SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
9SHA1 (patch-src_findlib_Makefile) = 0fc2570c4d2cb271bbd8a872d8331b3d3edcbc7c 9SHA1 (patch-src_findlib_Makefile) = f523a19a205257b320ebaab956b546659aa46ed4
cvs diff -r1.4 -r1.5 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2016/05/05 09:42:19 1.4
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-Makefile 2016/11/30 13:46:14 1.5
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-Makefile,v 1.4 2016/05/05 09:42:19 jaapb Exp $ 1$NetBSD: patch-Makefile,v 1.5 2016/11/30 13:46:14 wiz Exp $
2 2
3make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp 3make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
4--- Makefile.orig 2016-03-07 13:46:34.000000000 +0000 4--- Makefile.orig 2016-11-18 13:04:45.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -17,14 +17,14 @@ opt: 6@@ -17,14 +17,14 @@ opt:
7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done 7 for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
8  8
9 install: 9 install:
10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 10- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
12+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 12+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
13+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)" 13+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
14 $(MAKE) install-config 14 $(MAKE) install-config
15 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done 15 for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
16 $(MAKE) install-meta 16 $(MAKE) install-meta
17 cd src/findlib; $(MAKE) install-num-top 17 cd src/findlib; $(MAKE) install-num-top
18 if [ $(INSTALL_CAMLP4) -eq 1 ]; then \ 18 if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
19- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \ 19- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
20+ $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \ 20+ $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
21 fi 21 fi
22 $(MAKE) install-doc 22 $(MAKE) install-doc
23  23
24@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in 24@@ -71,9 +71,9 @@ findlib.conf: findlib.conf.in
25  25
26 .PHONY: install-doc 26 .PHONY: install-doc
27 install-doc: 27 install-doc:
28- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" 28- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
29- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" 29- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
30- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" 30- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
31+ $(BSD_INSTALL_MAN_DIR( "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" 31+ $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
32+ -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" 32+ -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
33+ -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" 33+ -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
34  34
35 .PHONY: uninstall-doc 35 .PHONY: uninstall-doc
36 uninstall-doc: 36 uninstall-doc:
37@@ -86,7 +86,7 @@ uninstall-doc: 37@@ -86,7 +86,7 @@ uninstall-doc:
38  38
39 .PHONY: install-meta 39 .PHONY: install-meta
40 install-meta: 40 install-meta:
41- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done 41- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
42+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done 42+ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; $(BSD_INSTALL_DATA) site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
43  43
44 .PHONY: uninstall-meta 44 .PHONY: uninstall-meta
45 uninstall-meta: 45 uninstall-meta:
46@@ -94,9 +94,9 @@ uninstall-meta: 46@@ -94,9 +94,9 @@ uninstall-meta:
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2016/02/02 11:41:46 1.6
+++ pkgsrc/devel/ocaml-findlib/patches/Attic/patch-src_findlib_Makefile 2016/11/30 13:46:14 1.7
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-src_findlib_Makefile,v 1.6 2016/02/02 11:41:46 jaapb Exp $ 1$NetBSD: patch-src_findlib_Makefile,v 1.7 2016/11/30 13:46:14 wiz Exp $
2 2
3Install into DESTDIR, use BSD install commands 3Install into DESTDIR, use BSD install commands
4--- src/findlib/Makefile.orig 2015-12-07 14:35:24.000000000 +0000 4--- src/findlib/Makefile.orig 2016-11-18 13:04:46.000000000 +0000
5+++ src/findlib/Makefile 5+++ src/findlib/Makefile
6@@ -112,23 +112,23 @@ clean: 6@@ -119,23 +119,23 @@ clean:
7 ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) 7 ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
8  8
9 install: all 9 install: all
10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" 10- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 11- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" 12- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
13+ $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" 13+ $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
14+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" 14+ $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
15+ test $(INSTALL_TOPFIND) -eq 0 || $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" 15+ test $(INSTALL_TOPFIND) -eq 0 || $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
16 files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma 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.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ 16 files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a 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.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
17- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" 17- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
18+ $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" 18+ $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
19 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ 19 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
20- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 20- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
21+ $(BSD_INSTALL_SCRIPT) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" 21+ $(BSD_INSTALL_SCRIPT) $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
22 # the following "if" block is only needed for 4.00beta2 22 # the following "if" block is only needed for 4.00beta2
23 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ 23 if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
24 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ 24 cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
25- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 25- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
26+ $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ 26+ $(BSD_INSTALL_DATA) topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
27 fi 27 fi
28  28
29 install-num-top: 29 install-num-top: