diff options
Diffstat (limited to 'lang/ocaml/patches/patch-Makefile')
| -rw-r--r-- | lang/ocaml/patches/patch-Makefile | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile index d04260d0a95..baf66f793df 100644 --- a/lang/ocaml/patches/patch-Makefile +++ b/lang/ocaml/patches/patch-Makefile @@ -1,10 +1,9 @@ -$NetBSD: patch-Makefile,v 1.7 2015/12/29 23:34:52 dholland Exp $ +$NetBSD: patch-Makefile,v 1.8 2016/05/05 08:12:01 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start - ---- Makefile.orig 2015-07-20 14:10:11.000000000 +0000 +--- Makefile.orig 2016-04-01 12:53:41.000000000 +0000 +++ Makefile -@@ -186,8 +186,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c +@@ -92,8 +92,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c # Start up the system from the distribution compiler coldstart: cd byterun; $(MAKE) all @@ -15,7 +14,7 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start cp yacc/ocamlyacc$(EXE) boot/ocamlyacc$(EXE) cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all cd stdlib; cp $(LIBFILES) ../boot -@@ -302,35 +304,35 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR) +@@ -206,36 +208,36 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR) install: if test -d $(INSTALL_BINDIR); then : ; \ @@ -35,8 +34,9 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start - cp VERSION $(INSTALL_LIBDIR)/ + else $(BSD_INSTALL_MAN_DIR) $(INSTALL_MANDIR)/man$(MANEXT); fi + $(BSD_INSTALL_DATA) VERSION $(INSTALL_LIBDIR)/ - cd $(INSTALL_LIBDIR); rm -f dllbigarray.so dllnums.so dllthreads.so \ - dllunix.so dllgraphics.so dllstr.so + cd $(INSTALL_LIBDIR); rm -f \ + dllbigarray$(EXT_DLL) dllnums$(EXT_DLL) dllthreads$(EXT_DLL) \ + dllunix$(EXT_DLL) dllgraphics$(EXT_DLL) dllstr$(EXT_DLL) cd byterun; $(MAKE) install - cp ocamlc $(INSTALL_BINDIR)/ocamlc$(EXE) - cp ocaml $(INSTALL_BINDIR)/ocaml$(EXE) @@ -65,13 +65,13 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start cd tools; $(MAKE) install -cd man; $(MAKE) install for i in $(OTHERLIBRARIES); do \ -@@ -341,16 +343,16 @@ install: - else :; fi - if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \ - else :; fi +@@ -243,20 +245,20 @@ install: + done + if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) install); fi + if test -n "$(WITH_DEBUGGER)"; then (cd debugger; $(MAKE) install); fi - cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config + $(BSD_INSTALL_DATA) config/Makefile $(INSTALL_LIBDIR)/Makefile.config - if test -f ocamlopt; then $(MAKE) installopt; else :; fi + if test -f ocamlopt; then $(MAKE) installopt; fi # Installation of the native-code compiler installopt: @@ -79,25 +79,46 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start - cp ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE) + $(BSD_INSTALL_SCRIPT) ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE) cd stdlib; $(MAKE) installopt +- cp middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \ ++ $(BSD_INSTALL_DATA) middle_end/*.cmi middle_end/*.cmt middle_end/*.cmti \ + $(INSTALL_COMPLIBDIR) +- cp middle_end/base_types/*.cmi middle_end/base_types/*.cmt \ ++ $(BSD_INSTALL_DATA) middle_end/base_types/*.cmi middle_end/base_types/*.cmt \ + middle_end/base_types/*.cmti $(INSTALL_COMPLIBDIR) - cp asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR) - cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR) + $(BSD_INSTALL_DATA) asmcomp/*.cmi asmcomp/*.cmt asmcomp/*.cmti $(INSTALL_COMPLIBDIR) + $(BSD_INSTALL_DATA) compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR) if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \ else :; fi - if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \ -@@ -361,10 +363,10 @@ installopt: + for i in $(OTHERLIBRARIES); \ +@@ -265,21 +267,21 @@ installopt: cd tools; $(MAKE) installopt installoptopt: - cp ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE) - cp ocamlopt.opt $(INSTALL_BINDIR)/ocamlopt.opt$(EXE) - cp lex/ocamllex.opt $(INSTALL_BINDIR)/ocamllex.opt$(EXE) -- cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \ +- cp utils/*.cmx parsing/*.cmx typing/*.cmx bytecomp/*.cmx \ + $(BSD_INSTALL_PROGRAM) ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE) + $(BSD_INSTALL_PROGRAM) ocamlopt.opt $(INSTALL_BINDIR)/ocamlopt.opt$(EXE) + $(BSD_INSTALL_PROGRAM) lex/ocamllex.opt $(INSTALL_BINDIR)/ocamllex.opt$(EXE) ++ $(BSD_INSTALL_DATA) utils/*.cmx parsing/*.cmx typing/*.cmx bytecomp/*.cmx \ + driver/*.cmx asmcomp/*.cmx $(INSTALL_COMPLIBDIR) +- cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \ + $(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \ compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \ compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \ $(BYTESTART:.cmo=.cmx) $(BYTESTART:.cmo=.o) \ + $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.o) \ + $(INSTALL_COMPLIBDIR) + if test -f ocamlnat ; then \ +- cp ocamlnat $(INSTALL_BINDIR)/ocamlnat$(EXE); \ +- cp toplevel/opttopdirs.cmi $(INSTALL_LIBDIR); \ +- cp compilerlibs/ocamlopttoplevel.cmxa \ ++ $(BSD_INSTALL_PROGRAM) ocamlnat $(INSTALL_BINDIR)/ocamlnat$(EXE); \ ++ $(BSD_INSTALL_DATA) toplevel/opttopdirs.cmi $(INSTALL_LIBDIR); \ ++ $(BSD_INSTALL_DATA) compilerlibs/ocamlopttoplevel.cmxa \ + compilerlibs/ocamlopttoplevel.a \ + $(OPTTOPLEVELSTART:.cmo=.cmx) $(OPTTOPLEVELSTART:.cmo=.o) \ + $(INSTALL_COMPLIBDIR); \ |