diff options
Diffstat (limited to 'lang/ocaml/patches/patch-ao')
| -rw-r--r-- | lang/ocaml/patches/patch-ao | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/lang/ocaml/patches/patch-ao b/lang/ocaml/patches/patch-ao index bdba1553373..2748838c32f 100644 --- a/lang/ocaml/patches/patch-ao +++ b/lang/ocaml/patches/patch-ao @@ -1,20 +1,28 @@ -$NetBSD: patch-ao,v 1.2 2004/04/22 09:18:38 tron Exp $ +$NetBSD: patch-ao,v 1.3 2005/02/04 21:35:51 adrianp Exp $ ---- camlp4/meta/Makefile.orig Fri Jul 19 16:53:49 2002 -+++ camlp4/meta/Makefile Thu Apr 22 10:34:37 2004 -@@ -42,10 +42,11 @@ +--- camlp4/meta/Makefile.orig 2004-10-14 16:17:42.000000000 +0100 ++++ camlp4/meta/Makefile 2004-10-14 16:19:48.000000000 +0100 +@@ -43,15 +43,16 @@ done install: -- -$(MKDIR) $(LIBDIR)/camlp4 $(BINDIR) -- cp $(OBJS) $(LIBDIR)/camlp4/. -- cp pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/. -- cp camlp4r$(EXE) $(BINDIR)/. -+ -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4 -+ -${BSD_INSTALL_PROGRAM_DIR} $(BINDIR) -+ ${BSD_INSTALL_DATA} $(OBJS) $(LIBDIR)/camlp4/. -+ ${BSD_INSTALL_DATA} pa_ifdef.cmi pa_extend.cmi $(LIBDIR)/camlp4/. -+ ${BSD_INSTALL_SCRIPT} camlp4r$(EXE) $(BINDIR)/. - if test -f $(COPT); then cp $(COPT) $(BINDIR)/.; fi +- -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)" +- cp $(OBJS) "$(LIBDIR)/camlp4/." +- cp pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/." +- cp camlp4r$(EXE) "$(BINDIR)/." ++ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4" ++ -${BSD_INSTALL_PROGRAM_DIR} "$(BINDIR)" ++ ${BSD_INSTALL_DATA} $(OBJS) "$(LIBDIR)/camlp4/." ++ ${BSD_INSTALL_DATA} pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/." ++ ${BSD_INSTALL_SCRIPT} camlp4r$(EXE) "$(BINDIR)/." + if test -f camlp4r.opt; then \ +- cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\ +- cp $(OBJSX) "$(LIBDIR)/camlp4/."; \ ++ ${BSD_INSTALL_SCRIPT} camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\ ++ ${BSD_INSTALL_DATA} $(OBJSX) "$(LIBDIR)/camlp4/."; \ + for file in $(OBJSX); do \ +- cp "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \ ++ ${BSD_INSTALL_DATA} "`echo $$file | sed -e 's/\.cmx$$/.$(O)/'`" "$(LIBDIR)/camlp4/."; \ + done ; \ + fi - include .depend |