SF.net SVN: gar:[23074] csw/mgar/pkg/ocaml/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Thu Feb 27 16:54:48 CET 2014
Revision: 23074
http://sourceforge.net/p/gar/code/23074
Author: cgrzemba
Date: 2014-02-27 15:54:32 +0000 (Thu, 27 Feb 2014)
Log Message:
-----------
ocaml/trunk: update version 4.01
Modified Paths:
--------------
csw/mgar/pkg/ocaml/trunk/Makefile
csw/mgar/pkg/ocaml/trunk/checksums
csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch
csw/mgar/pkg/ocaml/trunk/files/18-patch
csw/mgar/pkg/ocaml/trunk/files/2-patch
csw/mgar/pkg/ocaml/trunk/files/21-patch
csw/mgar/pkg/ocaml/trunk/files/4-patch
csw/mgar/pkg/ocaml/trunk/files/6-patch
csw/mgar/pkg/ocaml/trunk/files/9-patch
Added Paths:
-----------
csw/mgar/pkg/ocaml/trunk/files/22-patch
Modified: csw/mgar/pkg/ocaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ocaml/trunk/Makefile 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/Makefile 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,5 +1,6 @@
NAME = ocaml
-VERSION = 3.12.1
+VERSION = 4.01.0
+# VERSION = 3.12.1
GARTYPE = v2
DESCRIPTION = Objective Caml programming language
@@ -7,7 +8,7 @@
OCaml's toolset includes an interactive top level interpreter, a bytecode compiler, and an optimizing native code compiler. It has a large standard library that makes it useful for many of the same applications as Python or Perl, as well as robust modular and object-oriented programming constructs that make it applicable for large-scale software engineering. OCaml is the successor to Caml Light. The acronym CAML originally stood for Categorical Abstract Machine Language, although OCaml abandons this abstract machine.
endef
-MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-3.11/
+MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-$(basename $(VERSION))/
DISTFILES = $(NAME)-$(VERSION).tar.gz
GARCOMPILER = GCC4
@@ -35,6 +36,7 @@
PATCHFILES += 7-patch
PATCHFILES += 8-patch
PATCHFILES += 9-patch
+PATCHFILES += 22-patch
PATCHFILES += 0023-fix-build-for-tk-X11.patch
#
# this is only a error ignor patch taken from here:
Modified: csw/mgar/pkg/ocaml/trunk/checksums
===================================================================
--- csw/mgar/pkg/ocaml/trunk/checksums 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/checksums 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1 +1 @@
-814a047085f0f901ab7d8e3a4b7a9e65 ocaml-3.12.1.tar.gz
+04dfdd7da189462a4f10ec6530359cef ocaml-4.01.0.tar.gz
Modified: csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/0023-fix-build-for-tk-X11.patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,48 +1,22 @@
-From 3b0c53c72a5c0097fcd8fc06dd13d635da0a26e8 Mon Sep 17 00:00:00 2001
-From: Carsten Grzemba <cgrzemba at opencsw.org>
-Date: Fri, 25 Jan 2013 14:54:32 +0100
-Subject: [PATCH 23/23] fix build for tk X11
-
----
- configure | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/configure b/configure
-index b0390c2..ab96a84 100755
--- a/configure
+++ b/configure
-@@ -88,7 +88,7 @@ while : ; do
- -x11include*|--x11include*)
- x11_include_dir=$2; shift;;
- -x11lib*|--x11lib*)
-- x11_lib_dir=$2; shift;;
-+ x11_lib_dir=$2; echo "use X11 path: $x11_lib_dir"; shift;;
- -with-pthread*|--with-pthread*)
- ;; # Ignored for backward compatibility
- -no-pthread*|--no-pthread*)
-@@ -1309,18 +1309,19 @@ do
- test -f $dir/libX11.dylib || \
- test -f $dir/libX11.sa; then
- if test $dir = /usr/lib; then
-- x11_link="-lX11"
-+ x11_link="-lX11 -lXext"
- else
- x11_libs="-L$dir"
- case "$host" in
- *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
-- *) x11_link="-L$dir -lX11";;
-+ *) x11_link="-L$dir -lX11 -lXext";;
- esac
- fi
- break
- fi
- done
-
-+echo "set X11 Link $x11_link"
-
- if test "$x11_include" = "not found" || test "$x11_link" = "not found"
- then
-@@ -1463,16 +1464,16 @@ if test $has_tk = true; then
+@@ -1383,13 +1383,13 @@ if test "$x11_include" = "not found"; then
+ test -f $dir/libX11.dylib || \
+ test -f $dir/libX11.sa; then
+ if test $dir = /usr/lib; then
+- x11_link="-lX11"
++ x11_link="-lX11 -lXext"
+ else
+ x11_libs="-L$dir"
+ case "$host" in
+ *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
+ *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+- *) x11_link="-L$dir -lX11";;
++ *) x11_link="-L$dir -lX11 -lXext";;
+ esac
+ fi
+ break
+@@ -1506,16 +1506,16 @@ if test $has_tk = true; then
elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent
then
tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib"
@@ -63,7 +37,7 @@
esac
else
echo "Tcl library not found."
-@@ -1483,17 +1484,17 @@ fi
+@@ -1526,17 +1526,17 @@ fi
if test $has_tk = true; then
if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
echo "Tcl/Tk libraries found."
@@ -85,6 +59,3 @@
esac
echo "Tcl/Tk libraries found."
else
---
-1.8.1
-
Modified: csw/mgar/pkg/ocaml/trunk/files/18-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/18-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/18-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,6 +1,6 @@
--- a/otherlibs/threads/Makefile
+++ b/otherlibs/threads/Makefile
-@@ -100,12 +100,12 @@ clean: partialclean
+@@ -96,14 +96,14 @@ clean: partialclean
rm -f pervasives.mli marshal.mli unix.mli
install:
@@ -8,14 +8,16 @@
- mkdir -p $(LIBDIR)/vmthreads
- cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a
- cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
-- cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
-- cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)/vmthreads
+ if test -f dllvmthreads.so; then cp dllvmthreads.so $(DESTDIR)$(STUBLIBDIR)/.; fi
+ mkdir -p $(DESTDIR)$(LIBDIR)/vmthreads
+ cp libvmthreads.a $(DESTDIR)$(LIBDIR)/vmthreads/libvmthreads.a
+ cd $(DESTDIR)$(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a
-+ cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi threads.cma stdlib.cma unix.cma $(DESTDIR)$(LIBDIR)/vmthreads
-+ cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(DESTDIR)$(LIBDIR)/vmthreads
+ cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \
+- threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads
++ threads.cma stdlib.cma unix.cma $(DESTDIR)$(LIBDIR)/vmthreads
+ cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \
+- $(LIBDIR)/vmthreads
++ $(DESTDIR)$(LIBDIR)/vmthreads
installopt:
Modified: csw/mgar/pkg/ocaml/trunk/files/2-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/2-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/2-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,6 +1,6 @@
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
-@@ -52,9 +52,10 @@ clean::
+@@ -55,9 +55,10 @@ clean::
rm -f ocamldep.opt
install::
@@ -13,21 +13,27 @@
# The profiler
-@@ -70,9 +71,10 @@ ocamlcp: ocamlcp.cmo
- $(CAMLC) $(LINKFLAGS) -o ocamlcp warnings.cmo main_args.cmo ocamlcp.cmo
+@@ -79,13 +80,14 @@ ocamloptp: ocamloptp.cmo
+ opt:: profiling.cmx
install::
- cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
- cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
+- cp ocamloptp $(BINDIR)/ocamloptp$(EXE)
- cp profiling.cmi profiling.cmo $(LIBDIR)
+ ginstall -m 755 -d $(DESTDIR)$(LIBDIR)
-+ cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE)
-+ cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE)
-+ cp profiling.cmi profiling.cmo $(DESTDIR)$(LIBDIR)
++ cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE)
++ cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE)
++ cp ocamloptp $(DESTDIR)$(BINDIR)/ocamloptp$(EXE)
++ cp profiling.cmi profiling.cmo $(DESTDIR)$(LIBDIR)
+ installopt::
+- cp profiling.cmx profiling.o $(LIBDIR)
++ cp profiling.cmx profiling.o $(DESTDIR)$(LIBDIR)
+
clean::
- rm -f ocamlprof ocamlcp
-@@ -93,7 +95,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
+ rm -f ocamlprof ocamlcp ocamloptp
+@@ -106,7 +108,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
cp ../myocamlbuild_config.ml .
install::
@@ -36,16 +42,7 @@
clean::
rm -f ocamlmklib
-@@ -117,7 +119,7 @@ clean::
- # To make custom toplevels (see Makefile/Makefile.nt)
-
- install::
-- cp ocamlmktop $(BINDIR)/ # no $(EXE) here, ocamlmktop is a script
-+ cp ocamlmktop $(DESTDIR)$(BINDIR)/ # no $(EXE) here, ocamlmktop is a script
-
- clean::
- rm -f ocamlmktop
-@@ -234,8 +236,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO)
+@@ -291,8 +293,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO)
$(CAMLC) -o objinfo $(OBJINFO)
install::
Modified: csw/mgar/pkg/ocaml/trunk/files/21-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/21-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/21-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,9 +1,9 @@
--- a/ocamldoc/Makefile
+++ b/ocamldoc/Makefile
-@@ -37,10 +37,10 @@ OCAMLDOC_LIBCMA=odoc_info.cma
+@@ -36,10 +36,10 @@ OCAMLDOC_LIBCMA=odoc_info.cma
OCAMLDOC_LIBCMI=odoc_info.cmi
OCAMLDOC_LIBCMXA=odoc_info.cmxa
- OCAMLDOC_LIBA=odoc_info.a
+ OCAMLDOC_LIBA=odoc_info.$(A)
-INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
+INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/ocamldoc
INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
Added: csw/mgar/pkg/ocaml/trunk/files/22-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/22-patch (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/22-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -0,0 +1,11 @@
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -19,7 +19,7 @@ ocamlmktop: ocamlmktop.tpl ../config/Makefile
+ chmod +x ocamlmktop
+
+ install::
+- cp ocamlmktop $(BINDIR)
++ cp ocamlmktop $(DESTDIR)$(BINDIR)
+
+ clean::
+ rm -f ocamlmktop
Modified: csw/mgar/pkg/ocaml/trunk/files/4-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/4-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/4-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,11 +1,18 @@
--- a/stdlib/Makefile.shared
+++ b/stdlib/Makefile.shared
-@@ -41,7 +41,7 @@ OTHERS=array.cmo list.cmo char.cmo string.cmo sys.cmo \
- all: stdlib.cma std_exit.cmo camlheader camlheader_ur
+@@ -40,13 +40,13 @@ all: stdlib.cma std_exit.cmo camlheader camlheader_ur
- install:
-- cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
-+ cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(DESTDIR)$(LIBDIR)
+ install: install-$(RUNTIMED)
+ cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+- $(LIBDIR)
++ $(DESTDIR)$(LIBDIR)
+ install-noruntimed:
+ .PHONY: install-noruntimed
+
+ install-runtimed: camlheaderd
+- cp camlheaderd $(LIBDIR)
++ cp camlheaderd $(DESTDIR)$(LIBDIR)
+ .PHONY: install-runtimed
+
stdlib.cma: $(OBJS)
- $(CAMLC) -a -o stdlib.cma $(OBJS)
Modified: csw/mgar/pkg/ocaml/trunk/files/6-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/6-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/6-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,7 +1,7 @@
--- a/asmrun/Makefile
+++ b/asmrun/Makefile
-@@ -58,15 +58,15 @@ libasmrunp.a: $(POBJS)
- install: install-default install-$(PROFILING)
+@@ -63,23 +63,23 @@ libasmrunp.a: $(POBJS)
+ install: install-default install-$(RUNTIMED) install-$(PROFILING)
install-default:
- cp libasmrun.a $(LIBDIR)/libasmrun.a
@@ -9,6 +9,16 @@
+ cp libasmrun.a $(DESTDIR)$(LIBDIR)/libasmrun.a
+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrun.a
+ install-noruntimed:
+ .PHONY: install-noruntimed
+
+ install-runtimed:
+- cp libasmrund.a $(LIBDIR)/libasmrund.a
+- cd $(LIBDIR); $(RANLIB) libasmrund.a
++ cp libasmrund.a $(DESTDIR)$(LIBDIR)/libasmrund.a
++ cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrund.a
+ .PHONY: install-runtimed
+
install-noprof:
- rm -f $(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(LIBDIR)/libasmrunp.a
+ rm -f $(DESTDIR)$(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(DESTDIR)$(LIBDIR)/libasmrunp.a
@@ -17,7 +27,7 @@
- cp libasmrunp.a $(LIBDIR)/libasmrunp.a
- cd $(LIBDIR); $(RANLIB) libasmrunp.a
+ cp libasmrunp.a $(DESTDIR)$(LIBDIR)/libasmrunp.a
-+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrunp.a
++ $(DESTDIR)cd $(LIBDIR); $(RANLIB) libasmrunp.a
- power.o: power-$(SYSTEM).o
- cp power-$(SYSTEM).o power.o
+ power-bsd_elf.S: power-elf.S
+ cp power-elf.S power-bsd_elf.S
Modified: csw/mgar/pkg/ocaml/trunk/files/9-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/9-patch 2014-02-27 15:50:50 UTC (rev 23073)
+++ csw/mgar/pkg/ocaml/trunk/files/9-patch 2014-02-27 15:54:32 UTC (rev 23074)
@@ -1,22 +1,26 @@
--- a/Makefile
+++ b/Makefile
-@@ -273,26 +273,26 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+@@ -265,29 +265,29 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+ COMPLIBDIR=$(LIBDIR)/compiler-libs
- # Installation
install:
- if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi
- if test -d $(LIBDIR); then : ; else $(MKDIR) $(LIBDIR); fi
- if test -d $(STUBLIBDIR); then : ; else $(MKDIR) $(STUBLIBDIR); fi
+- if test -d $(COMPLIBDIR); then : ; else $(MKDIR) $(COMPLIBDIR); fi
- if test -d $(MANDIR)/man$(MANEXT); then : ; \
- else $(MKDIR) $(MANDIR)/man$(MANEXT); fi
+- cp VERSION $(LIBDIR)/
- cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
-+ if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESDIR)$(BINDIR); fi
-+ if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESDIR)$(LIBDIR); fi
++ if test -d $(DESTDIR)$(BINDIR); then : ; else $(MKDIR) $(DESTDIR)$(BINDIR); fi
++ if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(LIBDIR); fi
+ if test -d $(DESTDIR)$(STUBLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(STUBLIBDIR); fi
++ if test -d $(DESTDIR)$(COMPLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(COMPLIBDIR); fi
+ if test -d $(DESTDIR)$(MANDIR)/man$(MANEXT); then : ; \
+ else $(MKDIR) $(DESTDIR)$(MANDIR)/man$(MANEXT); fi
++ cp VERSION $(DESTDIR)$(LIBDIR)/
+ cd $(DESTDIR)$(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
- dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \
+ dllthreads.so dllunix.so dllgraphics.so dllstr.so \
dlltkanim.so
cd byterun; $(MAKE) install
- cp ocamlc $(BINDIR)/ocamlc$(EXE)
@@ -26,30 +30,30 @@
cd stdlib; $(MAKE) install
- cp lex/ocamllex $(BINDIR)/ocamllex$(EXE)
- cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE)
-- cp toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma
-- cp expunge $(LIBDIR)/expunge$(EXE)
-- cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR)
-- cp toplevel/topstart.cmo $(LIBDIR)
+ cp lex/ocamllex $(DESTDIR)$(BINDIR)/ocamllex$(EXE)
+ cp yacc/ocamlyacc$(EXE) $(DESTDIR)$(BINDIR)/ocamlyacc$(EXE)
-+ cp toplevel/toplevellib.cma $(DESTDIR)$(LIBDIR)/toplevellib.cma
+ cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \
+- toplevel/*.cmi $(COMPLIBDIR)
++ toplevel/*.cmi $(DESTDIR)$(COMPLIBDIR)
+ cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \
+ compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \
+- $(COMPLIBDIR)
+- cp expunge $(LIBDIR)/expunge$(EXE)
+- cp toplevel/topdirs.cmi $(LIBDIR)
++ $(DESTDIR)$(COMPLIBDIR)
+ cp expunge $(DESTDIR)$(LIBDIR)/expunge$(EXE)
-+ cp typing/outcometree.cmi typing/outcometree.mli $(DESTDIR)$(LIBDIR)
-+ cp toplevel/topstart.cmo $(DESTDIR)$(LIBDIR)
- cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \
-- $(LIBDIR)
-+ $(DESTDIR)$(LIBDIR)
++ cp toplevel/topdirs.cmi $(DESTDIR)$(LIBDIR)
cd tools; $(MAKE) install
-cd man; $(MAKE) install
for i in $(OTHERLIBRARIES); do \
-@@ -302,24 +302,24 @@ install:
+@@ -297,17 +297,17 @@ install:
if test -f ocamlopt; then $(MAKE) installopt; else :; fi
if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
else :; fi
- cp config/Makefile $(LIBDIR)/Makefile.config
- BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \
+ cp config/Makefile $(DESTDIR)$(LIBDIR)/Makefile.config
-+ BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) MANDIR=$(DESTDIR)$(MANDIR) \
++ BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) PREFIX=$(DESTDIR)$(PREFIX) MANDIR=$(DESTDIR)$(MANDIR) \
./build/partial-install.sh
# Installation of the native-code compiler
@@ -58,18 +62,32 @@
- cp ocamlopt $(BINDIR)/ocamlopt$(EXE)
+ cp ocamlopt $(DESTDIR)$(BINDIR)/ocamlopt$(EXE)
cd stdlib; $(MAKE) installopt
+- cp asmcomp/*.cmi $(COMPLIBDIR)
+- cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(COMPLIBDIR)
++ cp asmcomp/*.cmi $(DESTDIR)$(COMPLIBDIR)
++ cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(DESTDIR)$(COMPLIBDIR)
cd ocamldoc; $(MAKE) installopt
for i in $(OTHERLIBRARIES); \
do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
- if test -f ocamlc.opt; \
-- then cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi
-+ then cp ocamlc.opt $(DESTDIR)$(BINDIR)/ocamlc.opt$(EXE); else :; fi
- if test -f ocamlopt.opt; \
-- then cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE); else :; fi
-+ then cp ocamlopt.opt $(DESTDIR)$(BINDIR)/ocamlopt.opt$(EXE); else :; fi
- if test -f lex/ocamllex.opt; \
-- then cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi
-+ then cp lex/ocamllex.opt $(DESTDIR)$(BINDIR)/ocamllex.opt$(EXE); else :; fi
+@@ -315,16 +315,16 @@ installopt:
+ cd tools; $(MAKE) installopt
+ installoptopt:
+- cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE)
+- cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE)
+- cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE)
++ cp ocamlc.opt $(DESTDIR)$(BINDIR)/ocamlc.opt$(EXE)
++ cp ocamlopt.opt $(DESTDIR)$(BINDIR)/ocamlopt.opt$(EXE)
++ cp lex/ocamllex.opt $(DESTDIR)$(BINDIR)/ocamllex.opt$(EXE)
+ cp 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) \
+- $(COMPLIBDIR)
+- cd $(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
++ $(DESTDIR)$(COMPLIBDIR)
++ cd $(DESTDIR)$(COMPLIBDIR) && $(RANLIB) ocamlcommon.a ocamlbytecomp.a \
+ ocamloptcomp.a
+
clean:: partialclean
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list