$NetBSD: patch-Makefile,v 1.9 2022/02/02 14:45:18 wiz Exp $ use BSD_INSTALL_* instead of mkdir and cp --- Makefile.orig 2022-01-24 14:15:03.000000000 +0000 +++ Makefile @@ -24,7 +24,7 @@ install: check-installation for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done $(MAKE) install-meta test ! -f 'site-lib-src/num-top/META' || { cd src/findlib; $(MAKE) install-num-top; } - test ! -f 'site-lib-src/camlp4/META' || cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)" + test ! -f 'site-lib-src/camlp4/META' || $(BSD_INSTALL_SCRIPT) tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)" $(MAKE) install-doc uninstall: check-installation @@ -70,9 +70,9 @@ findlib.conf: findlib.conf.in .PHONY: install-doc install-doc: - mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5" - -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" - -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" + $(BSD_INSTALL_MAN_DIR) "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5" + -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" + -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" .PHONY: uninstall-doc uninstall-doc: @@ -102,8 +102,8 @@ check-installation: .PHONY: install-meta install-meta: - for x in $(SITELIB_META); do mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" && mv "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" "$(prefix)$(OCAML_SITELIB)/$$x/META"; done - mkdir -p "$(prefix)$(OCAML_SITELIB)/findlib"; cp Makefile.packages "$(prefix)$(OCAML_SITELIB)/findlib/Makefile.packages" + for x in $(SITELIB_META); do $(BSD_INSTALL_LIB_DIR) -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" && mv "$(prefix)$(OCAML_SITELIB)/$$x/META.tmp" "$(prefix)$(OCAML_SITELIB)/$$x/META"; done + $(BSD_INSTALL_LIB_DIR) -p "$(prefix)$(OCAML_SITELIB)/findlib"; $(BSD_INSTALL_DATA) Makefile.packages "$(prefix)$(OCAML_SITELIB)/findlib/Makefile.packages" .PHONY: uninstall-meta uninstall-meta: @@ -111,9 +111,9 @@ uninstall-meta: .PHONY: install-config install-config: - mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" + $(BSD_INSTALL_DATA_DIR) "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi - test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)" + test -f "$(prefix)$(OCAMLFIND_CONF)" || $(BSD_INSTALL_DATA) findlib.conf "$(prefix)$(OCAMLFIND_CONF)" .PHONY: uninstall-config uninstall-config: