| @@ -1,71 +1,71 @@ | | | @@ -1,71 +1,71 @@ |
1 | $NetBSD: patch-aa,v 1.2 2009/09/07 21:53:31 tonio Exp $ | | 1 | $NetBSD: patch-aa,v 1.2.22.1 2012/04/15 14:35:20 tron Exp $ |
2 | | | 2 | |
3 | --- Makefile.orig 2009-06-13 01:49:38.000000000 +0200 | | 3 | --- Makefile.orig 2011-07-06 16:21:30.000000000 +0000 |
4 | +++ Makefile 2009-07-10 10:55:08.000000000 +0200 | | 4 | +++ Makefile |
5 | @@ -1,7 +1,7 @@ | | 5 | @@ -1,7 +1,7 @@ |
6 | #-include config/Makefile | | 6 | #-include config/Makefile |
7 | | | 7 | |
8 | OCAML_VERSION := $(shell ocamlc -version) | | 8 | OCAML_VERSION := $(shell ocamlc -version) |
9 | -OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2 | | 9 | -OCAML_SOURCE := /usr/src/ocaml-source-$(OCAML_VERSION).tar.bz2 |
10 | +OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2 | | 10 | +OCAML_SOURCE := $(DISTDIR)/ocaml-$(OCAML_VERSION).tar.bz2 |
11 | OCAML_SRCDIR := ocaml-$(OCAML_VERSION) | | 11 | OCAML_SRCDIR := ocaml-$(OCAML_VERSION) |
12 | | | 12 | |
13 | DUCE_VERSION := $(shell head -n1 VERSION) | | 13 | DUCE_VERSION := $(shell head -n1 VERSION) |
14 | @@ -36,7 +36,7 @@ | | 14 | @@ -37,7 +37,7 @@ all: |
15 | @echo "===> Please explicit what you want <===" | | 15 | @echo "===> Please explicit what you want <===" |
16 | | | 16 | |
17 | prepare: | | 17 | prepare: |
18 | - tar xf $(OCAML_SOURCE) | | 18 | - tar xf $(OCAML_SOURCE) |
19 | + tar jxf $(OCAML_SOURCE) | | 19 | + tar jxf $(OCAML_SOURCE) |
20 | cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR) | | 20 | cp -PpR $(DUCEP_FILES) $(OCAML_SRCDIR) |
21 | cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs | | 21 | cp -PpR ocamlduce $(OCAML_SRCDIR)/otherlibs |
22 | cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done | | 22 | cd $(OCAML_SRCDIR) && for X in ../patches/*.diff; do patch -p1 < $$X; done |
23 | @@ -44,15 +44,11 @@ | | 23 | @@ -45,15 +45,11 @@ prepare: |
24 | sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new | | 24 | sed '\@^#-include config/Makefile@s/^#//' $(OCAML_SRCDIR)/Makefile.ocamlduce > $(OCAML_SRCDIR)/Makefile.ocamlduce.new |
25 | mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce | | 25 | mv $(OCAML_SRCDIR)/Makefile.ocamlduce.new $(OCAML_SRCDIR)/Makefile.ocamlduce |
26 | | | 26 | |
27 | -config/Makefile: | | 27 | -config/Makefile: |
28 | - @echo "===> You should probably run ./configure yourself, trying on my own... <===" | | 28 | - @echo "===> You should probably run ./configure yourself, trying on my own... <===" |
29 | - $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1@p' $(shell ocamlc -where)/Makefile.config) | | 29 | - $(shell sed -ne '1s@^.*\(./configure.*\)$$@\1@p' $(shell ocamlc -where)/Makefile.config) |
30 | +world: $(OCAML_SRCDIR)/config/Makefile | | 30 | +world: $(OCAML_SRCDIR)/config/Makefile |
31 | + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh | | 31 | + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh |
32 | | | 32 | |
33 | -world: config/Makefile | | 33 | -world: config/Makefile |
34 | - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh | | 34 | - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" ./mkocamlduce.sh |
35 | - | | 35 | - |
36 | -world.opt: config/Makefile | | 36 | -world.opt: config/Makefile |
37 | - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh | | 37 | - MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh |
38 | +world.opt: $(OCAML_SRCDIR)/config/Makefile | | 38 | +world.opt: $(OCAML_SRCDIR)/config/Makefile |
39 | + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh | | 39 | + cd $(OCAML_SRCDIR) && MAKE="$(MAKE)" CFLAGS="$(CFLAGS)" HAS_NATIVE=y ./mkocamlduce.sh |
40 | | | 40 | |
41 | META: META.in | | 41 | META: META.in |
42 | sed 's/%VER%/$(DUCE_VERSION)/' $< > $@ | | 42 | sed 's/%VER%/$(DUCE_VERSION)/' $< > $@ |
43 | @@ -63,20 +59,20 @@ | | 43 | @@ -64,20 +60,20 @@ installcommon-stamp: META |
44 | install -m 755 -d $(DUCE_LIBDIR) | | 44 | install -m 755 -d $(DUCE_LIBDIR) |
45 | install -m 755 ocamlducefind $(BINDIR) | | 45 | install -m 755 ocamlducefind $(BINDIR) |
46 | install -m 644 META $(DUCE_LIBDIR) | | 46 | install -m 644 META $(DUCE_LIBDIR) |
47 | - install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR) | | 47 | - install -m 644 $(addprefix _build/,$(MLI)) $(DUCE_LIBDIR) |
48 | - install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR) | | 48 | - install -m 644 $(addprefix _build/,$(CMI)) $(DUCE_LIBDIR) |
49 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR) | | 49 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(MLI)) $(DUCE_LIBDIR) |
50 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR) | | 50 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMI)) $(DUCE_LIBDIR) |
51 | | | 51 | |
52 | installbyte: installcommon-stamp | | 52 | installbyte: installcommon-stamp |
53 | @echo "===> Installing non-native files... <===" | | 53 | @echo "===> Installing non-native files... <===" |
54 | - for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done | | 54 | - for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done |
55 | - install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR) | | 55 | - install -m 644 $(addprefix _build/,$(TOPCMO)) $(DUCE_LIBDIR) |
56 | - install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR) | | 56 | - install -m 644 $(addprefix _build/,$(TOPCMA)) $(DUCE_LIBDIR) |
57 | - install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR) | | 57 | - install -m 644 $(addprefix _build/,$(CMA)) $(DUCE_LIBDIR) |
58 | + for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done | | 58 | + for X in $(BYT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done |
59 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR) | | 59 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMO)) $(DUCE_LIBDIR) |
60 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR) | | 60 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(TOPCMA)) $(DUCE_LIBDIR) |
61 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR) | | 61 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMA)) $(DUCE_LIBDIR) |
62 | | | 62 | |
63 | installopt: installcommon-stamp | | 63 | installopt: installcommon-stamp |
64 | @echo "===> Installing native files... <===" | | 64 | @echo "===> Installing native files... <===" |
65 | - for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done | | 65 | - for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done |
66 | - install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR) | | 66 | - install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) |
67 | + for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done | | 67 | + for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 $(OCAML_SRCDIR)/_build/$$X $(BINDIR)/ocamlduce$$Y; done |
68 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA)) $(DUCE_LIBDIR) | | 68 | + install -m 644 $(addprefix $(OCAML_SRCDIR)/_build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR) |
69 | | | 69 | |
70 | clean: | | 70 | clean: |
71 | build/distclean.sh | | 71 | build/distclean.sh |