summaryrefslogtreecommitdiff
path: root/lang/ocaml/patches/patch-bs
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ocaml/patches/patch-bs')
-rw-r--r--lang/ocaml/patches/patch-bs32
1 files changed, 15 insertions, 17 deletions
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
index 9df022fa35c..038fb11dcf1 100644
--- a/lang/ocaml/patches/patch-bs
+++ b/lang/ocaml/patches/patch-bs
@@ -1,8 +1,8 @@
-$NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
+$NetBSD: patch-bs,v 1.6 2009/09/07 21:48:14 tonio Exp $
---- tools/Makefile.orig 2007-02-07 11:31:36.000000000 +0100
-+++ tools/Makefile
-@@ -49,9 +49,9 @@ clean::
+--- tools/Makefile.shared.orig 2007-11-22 23:14:43.000000000 +0100
++++ tools/Makefile.shared
+@@ -51,9 +51,9 @@ clean::
rm -f ocamldep.opt
install::
@@ -14,7 +14,7 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
# The profiler
-@@ -67,9 +67,9 @@ ocamlcp: ocamlcp.cmo
+@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo
$(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo
install::
@@ -27,12 +27,10 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
clean::
rm -f ocamlprof ocamlcp
-@@ -81,7 +81,7 @@ ocamlmktop: ocamlmktop.tpl ../config/Mak
- chmod +x ocamlmktop
install::
-- cp ocamlmktop $(BINDIR)/ocamlmktop
-+ ${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop
+- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
++ ${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
clean::
rm -f ocamlmktop
@@ -40,21 +38,21 @@ $NetBSD: patch-bs,v 1.5 2007/09/14 15:34:12 adam Exp $
cp ../myocamlbuild_config.ml .
install::
-- cp ocamlmklib $(BINDIR)/ocamlmklib
-+ ${BSD_INSTALL_SCRIPT} ocamlmklib $(BINDIR)/ocamlmklib
+- cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
++ ${BSD_INSTALL_SCRIPT} ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
clean::
rm -f ocamlmklib
-@@ -146,7 +146,7 @@ lexer301.ml: lexer301.mll
- $(CAMLLEX) lexer301.mll
+@@ -121,7 +121,7 @@ clean::
+ # To make custom toplevels (see Makefile/Makefile.nt)
install::
-- cp scrapelabels $(LIBDIR)
-+ ${BSD_INSTALL_DATA} scrapelabels $(LIBDIR)
+- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
++ ${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
clean::
- rm -f scrapelabels lexer301.ml
-@@ -162,7 +162,7 @@ addlabels: addlabels.ml
+ rm -f ocamlmktop
+@@ -171,7 +171,7 @@ addlabels: addlabels.ml
$(ADDLABELS_IMPORTS) addlabels.ml
install::