- updated for 3.05

Changed files:
    ocaml-build.patch -> 1.2
    ocaml-manlinks.patch -> 1.2

diff --git a/ocaml-build.patch b/ocaml-build.patch
index 7a3ac66d4eecbc1d30658c684795c8c2545a1cbb..5a16eca3d7e006030d802f5abf81211074a2478d 100644 (file)
--- a/ocaml-build.patch
+++ b/ocaml-build.patch
@@ -1,24 +1,24 @@
-diff -ur ocaml-3.04/camlp4/meta/Makefile ocaml-3.04-/camlp4/meta/Makefile
---- ocaml-3.04/camlp4/meta/Makefile    Sat Sep 29 03:08:35 2001
-+++ ocaml-3.04-/camlp4/meta/Makefile   Thu Jan 31 17:20:03 2002
+diff -ur ocaml-3.05/camlp4/meta/Makefile ocaml-3.05-/camlp4/meta/Makefile
+--- ocaml-3.05/camlp4/meta/Makefile    Fri Jul 19 16:53:49 2002
++++ ocaml-3.05-/camlp4/meta/Makefile   Thu Aug  8 13:19:11 2002
 @@ -2,7 +2,7 @@
  
  include ../config/Makefile
  
 -INCLUDES=-I ../camlp4 -I ../boot -I $(OTOP)/utils
 +INCLUDES=-I ../camlp4 -I ../boot -I $(OTOP)/utils -I $(OTOP)/parsing
- OCAMLCFLAGS=$(INCLUDES)
+ OCAMLCFLAGS=-warn-error A $(INCLUDES)
  OBJS=q_MLast.cmo pa_r.cmo pa_rp.cmo pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo pr_dump.cmo
  CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo
-diff -ur ocaml-3.04/camlp4/ocaml_src/meta/Makefile ocaml-3.04-/camlp4/ocaml_src/meta/Makefile
---- ocaml-3.04/camlp4/ocaml_src/meta/Makefile  Tue Oct  2 13:49:03 2001
-+++ ocaml-3.04-/camlp4/ocaml_src/meta/Makefile Thu Jan 31 17:18:39 2002
+diff -ur ocaml-3.05/camlp4/ocaml_src/meta/Makefile ocaml-3.05-/camlp4/ocaml_src/meta/Makefile
+--- ocaml-3.05/camlp4/ocaml_src/meta/Makefile  Fri Jul 19 16:53:53 2002
++++ ocaml-3.05-/camlp4/ocaml_src/meta/Makefile Thu Aug  8 13:19:37 2002
 @@ -2,7 +2,7 @@
  
  include ../../config/Makefile
  
 -INCLUDES=-I ../camlp4 -I ../../boot -I $(OTOP)/utils
 +INCLUDES=-I ../camlp4 -I ../../boot -I $(OTOP)/utils -I $(OTOP)/parsing
- OCAMLCFLAGS=$(INCLUDES)
+ OCAMLCFLAGS=-warn-error A $(INCLUDES)
  OBJS=q_MLast.cmo pa_r.cmo pa_rp.cmo pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo pr_dump.cmo
  CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo

diff --git a/ocaml-manlinks.patch b/ocaml-manlinks.patch
index 6e5107af949998180efbeacd6d03b9721f66dc8f..a1866bc6ec94d7c722308eb5031ccb527f2f5913 100644 (file)
--- a/ocaml-manlinks.patch
+++ b/ocaml-manlinks.patch
@@ -1,24 +1,23 @@
-diff -ur ocaml-3.04--/camlp4/man/Makefile ocaml-3.04/camlp4/man/Makefile
---- ocaml-3.04--/camlp4/man/Makefile   Wed Sep 26 16:32:50 2001
-+++ ocaml-3.04/camlp4/man/Makefile     Sat Feb  2 01:48:21 2002
+diff -ur ocaml-3.05.orig/camlp4/man/Makefile ocaml-3.05/camlp4/man/Makefile
+--- ocaml-3.05.orig/camlp4/man/Makefile        Fri Jul 19 16:53:49 2002
++++ ocaml-3.05/camlp4/man/Makefile     Thu Aug  8 13:39:02 2002
 @@ -14,14 +14,11 @@
  get_promote:
  
  install:
--      -$(MKDIR) $(MANDIR)
--      -cp $(TARGET) $(MANDIR)/.
--      -cd $(MANDIR); rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1
--      -cd $(MANDIR); rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1
--      -cd $(MANDIR); rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1
--      -cd $(MANDIR); rm -f ocpp.1; ln -s $(TARGET) ocpp.1
--      -cd $(MANDIR); rm -f camlp4o.opt.1; ln -s $(TARGET) camlp4o.opt.1
--      -cd $(MANDIR); rm -f camlp4r.opt.1; ln -s $(TARGET) camlp4r.opt.1
-+      -$(MKDIR) $(DESTDIR)$(MANDIR)
-+      cp $(TARGET) $(DESTDIR)$(MANDIR)/.
+-      -$(MKDIR) $(MANDIR)/man1
+-      -cp $(TARGET) $(MANDIR)/man1/.
+-      -cd $(MANDIR)/man1; rm -f camlp4o.1; ln -s $(TARGET) camlp4o.1
+-      -cd $(MANDIR)/man1; rm -f camlp4r.1; ln -s $(TARGET) camlp4r.1
+-      -cd $(MANDIR)/man1; rm -f mkcamlp4.1; ln -s $(TARGET) mkcamlp4.1
+-      -cd $(MANDIR)/man1; rm -f ocpp.1; ln -s $(TARGET) ocpp.1
+-      -cd $(MANDIR)/man1; rm -f camlp4o.opt.1; ln -s $(TARGET) camlp4o.opt.1
+-      -cd $(MANDIR)/man1; rm -f camlp4r.opt.1; ln -s $(TARGET) camlp4r.opt.1
++      -$(MKDIR) $(MANDIR)/man1/.
++      cp $(TARGET) $(MANDIR)/man1/.
 +      for f in camlp4o camlp4r mkcamlp4 ocpp camlp4o.opt camlp4r.opt ; do \
-+              echo ".so man1/$(TARGET)" > $(DESTDIR)$(MANDIR)/$$f.1 ; \
-+      done
++              echo ".so man1/$(TARGET)" > $(MANDIR)/man1/$$f.1 ; \
++      done
  
  camlp4.1: camlp4.1.tpl
        sed -e "s'LIBDIR'$(LIBDIR)'g" camlp4.1.tpl > camlp4.1
-