[csw-devel] SF.net SVN: gar:[20438] csw/mgar/pkg/ocaml/trunk
cgrzemba at users.sourceforge.net
cgrzemba at users.sourceforge.net
Tue Mar 12 13:05:38 CET 2013
Revision: 20438
http://gar.svn.sourceforge.net/gar/?rev=20438&view=rev
Author: cgrzemba
Date: 2013-03-12 12:05:37 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
ocaml/trunk: bump version 3.12.1
Modified Paths:
--------------
csw/mgar/pkg/ocaml/trunk/Makefile
csw/mgar/pkg/ocaml/trunk/checksums
csw/mgar/pkg/ocaml/trunk/files/0-patch
csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch
csw/mgar/pkg/ocaml/trunk/files/14-patch
csw/mgar/pkg/ocaml/trunk/files/17-patch
csw/mgar/pkg/ocaml/trunk/files/19-patch
csw/mgar/pkg/ocaml/trunk/files/2-patch
csw/mgar/pkg/ocaml/trunk/files/3-patch
csw/mgar/pkg/ocaml/trunk/files/8-patch
csw/mgar/pkg/ocaml/trunk/files/9-patch
Modified: csw/mgar/pkg/ocaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/Makefile 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,5 +1,5 @@
NAME = ocaml
-VERSION = 3.11.2
+VERSION = 3.12.1
GARTYPE = v2
DESCRIPTION = Objective Caml programming language
@@ -18,7 +18,7 @@
PATCHFILES += 0-patch
PATCHFILES += 10-patch
PATCHFILES += 12-patch
-PATCHFILES += 13-patch
+# PATCHFILES += 13-patch
PATCHFILES += 14-patch
PATCHFILES += 15-patch
PATCHFILES += 16-patch
Modified: csw/mgar/pkg/ocaml/trunk/checksums
===================================================================
--- csw/mgar/pkg/ocaml/trunk/checksums 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/checksums 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1 +1 @@
-9d0611245122ffbc8263735cae1da7fb ocaml-3.11.2.tar.gz
+814a047085f0f901ab7d8e3a4b7a9e65 ocaml-3.12.1.tar.gz
Modified: csw/mgar/pkg/ocaml/trunk/files/0-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/0-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/0-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -11,10 +11,10 @@
+ $(MKDIR) $(DESTDIR)$(MANDIR)/man1 ; \
+ cp $(TARGET) $(DESTDIR)$(MANDIR)/man1/. ; \
for i in $(ALIASES); do \
-- rm -f $(MANDIR)/man1/$$i; \
-- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
-+ rm -f $(DESTDIR)$(MANDIR)/man1/$$i; \
-+ echo '.so man1/$(TARGET)' > $(DESTDIR)$(MANDIR)/man1/$$i; \
- done; \
+- rm -f $(MANDIR)/man1/$$i; \
+- echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
++ rm -f $(DESTDIR)$(MANDIR)/man1/$$i; \
++ echo '.so man1/$(TARGET)' > $(DESTDIR)$(MANDIR)/man1/$$i; \
+ done; \
fi
Modified: csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/01-nfs-close-bug.patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,12 +1,12 @@
--- a/byterun/io.c
+++ b/byterun/io.c
-@@ -479,6 +479,9 @@ CAMLprim value caml_ml_close_channel(value vchannel)
- struct channel * channel = Channel(vchannel);
- if (channel->fd != -1){
- result = close(channel->fd);
-+ /* Work around an NFS issue that causes close() to fails with EINVAL */
-+ if ((result < 0) && (errno == EINVAL))
-+ result = 0;
- channel->fd = -1;
- }else{
- result = 0;
+@@ -518,7 +518,8 @@ CAMLprim value caml_ml_close_channel(value vchannel)
+ caml_leave_blocking_section();
+ }
+
+- if (result == -1) caml_sys_error (NO_ARG);
++ /* Work around an NFS issue that causes close() to fails with EINVAL */
++ if ((result == -1) && (errno != EINVAL)) caml_sys_error (NO_ARG);
+ return Val_unit;
+ }
+
Modified: csw/mgar/pkg/ocaml/trunk/files/14-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/14-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/14-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,15 +1,25 @@
--- a/otherlibs/labltk/lib/Makefile
+++ b/otherlibs/labltk/lib/Makefile
-@@ -62,9 +62,9 @@ install:
+@@ -58,18 +58,18 @@ $(LIBNAME): Makefile $(TOPDIR)/config/Makefile
+ @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) $$*' >> $@
+
+ install-script: $(LIBNAME)
+- cp $(LIBNAME) $(BINDIR)
+- chmod 755 $(BINDIR)/$(LIBNAME)
++ cp $(LIBNAME) $(DESTDIR)$(BINDIR)
++ chmod 755 $(DESTDIR)$(BINDIR)/$(LIBNAME)
+
+ install-batch:
+- cp labltk.bat $(BINDIR)
++ cp labltk.bat $(DESTDIR)$(BINDIR)
+
+ install:
+ if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR)
chmod 644 $(INSTALLDIR)/$(LIBNAME).cma
chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE)
- @if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
-- cp $(LIBNAME) $(BINDIR)
-- chmod 755 $(BINDIR)/$(LIBNAME)
+ @if test -d $(DESTDIR)$(BINDIR); then : ; else mkdir $(DESTDIR)$(BINDIR); fi
-+ cp $(LIBNAME) $(DESTDIR)$(BINDIR)
-+ chmod 755 $(DESTDIR)$(BINDIR)/$(LIBNAME)
-
- installopt:
- @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi
+ @case x$(TOOLCHAIN) in \
+ xmingw|xmsvc) $(MAKE) install-batch ;; \
+ *) $(MAKE) install-script ;; \
Modified: csw/mgar/pkg/ocaml/trunk/files/17-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/17-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/17-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,6 +1,6 @@
--- a/otherlibs/dynlink/Makefile
+++ b/otherlibs/dynlink/Makefile
-@@ -66,12 +66,12 @@ extract_crc: dynlink.cma extract_crc.cmo
+@@ -66,13 +66,13 @@ extract_crc: dynlink.cma extract_crc.cmo
$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
install:
@@ -10,10 +10,11 @@
+ cp extract_crc $(DESTDIR)$(LIBDIR)/extract_crc$(EXE)
installopt:
-- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR)
-- cd $(LIBDIR); $(RANLIB) dynlink.$(A)
-+ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(DESTDIR)$(LIBDIR)
-+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) dynlink.$(A)
+ if $(NATDYNLINK); then \
+- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \
+- cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \
++ cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(DESTDIR)$(LIBDIR) && \
++ cd $(DESTDIR)$(LIBDIR) && $(RANLIB) dynlink.$(A); \
+ fi
partialclean:
- rm -f extract_crc *.cm[ioax] *.cmxa
Modified: csw/mgar/pkg/ocaml/trunk/files/19-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/19-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/19-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,7 +1,7 @@
--- a/otherlibs/systhreads/Makefile
+++ b/otherlibs/systhreads/Makefile
-@@ -76,19 +76,19 @@ clean: partialclean
- rm -f $(GENFILES)
+@@ -70,20 +70,20 @@ clean: partialclean
+ rm -f *.o *.a *.so
install:
- if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
@@ -11,6 +11,7 @@
- cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads
- rm -f $(LIBDIR)/threads/stdlib.cma
- cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR)
+- cp threads.h $(LIBDIR)/caml/threads.h
+ if test -f dllthreads.so; then cp dllthreads.so $(DESTDIR)$(STUBLIBDIR)/dllthreads.so; fi
+ cp libthreads.a $(DESTDIR)$(LIBDIR)/libthreads.a
+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) libthreads.a
@@ -18,6 +19,7 @@
+ cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(DESTDIR)$(LIBDIR)/threads
+ rm -f $(DESTDIR)$(LIBDIR)/threads/stdlib.cma
+ cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(DESTDIR)$(LIBDIR)
++ cp threads.h $(DESTDIR)$(LIBDIR)/caml/threads.h
installopt:
- cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
Modified: csw/mgar/pkg/ocaml/trunk/files/2-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/2-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/2-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,10 +1,11 @@
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
-@@ -51,9 +51,9 @@ clean::
+@@ -52,9 +52,10 @@ clean::
rm -f ocamldep.opt
install::
- cp ocamldep $(BINDIR)/ocamldep$(EXE)
++ ginstall -m 755 -d $(DESTDIR)$(BINDIR)
+ cp ocamldep $(DESTDIR)$(BINDIR)/ocamldep$(EXE)
if test -f ocamldep.opt; \
- then cp ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi
@@ -12,68 +13,46 @@
# The profiler
-@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo
- $(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo
+@@ -70,9 +71,10 @@ ocamlcp: ocamlcp.cmo
+ $(CAMLC) $(LINKFLAGS) -o ocamlcp warnings.cmo main_args.cmo ocamlcp.cmo
install::
- cp ocamlprof $(BINDIR)/ocamlprof$(EXE)
- cp ocamlcp $(BINDIR)/ocamlcp$(EXE)
- cp profiling.cmi profiling.cmo $(LIBDIR)
-+ cp ocamlprof $(DESTDIR)$(BINDIR)/ocamlprof$(EXE)
-+ cp ocamlcp $(DESTDIR)$(BINDIR)/ocamlcp$(EXE)
-+ cp profiling.cmi profiling.cmo $(DESTDIR)$(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)
clean::
rm -f ocamlprof ocamlcp
-
- install::
-- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
-+ cp ocamlmktop $(DESTDIR)$(BINDIR)/ocamlmktop$(EXE)
-
- clean::
- rm -f ocamlmktop
-@@ -97,7 +97,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
+@@ -93,7 +95,7 @@ myocamlbuild_config.ml: ../config/Makefile ../build/mkmyocamlbuild_config.sh
cp ../myocamlbuild_config.ml .
install::
- cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
-+ cp ocamlmklib $(DESTDIR)$(BINDIR)/ocamlmklib$(EXE)
++ cp ocamlmklib $(DESTDIR)$(BINDIR)/ocamlmklib$(EXE)
clean::
rm -f ocamlmklib
-@@ -121,7 +121,7 @@ clean::
+@@ -117,7 +119,7 @@ clean::
# To make custom toplevels (see Makefile/Makefile.nt)
install::
-- cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
-+ cp ocamlmktop $(DESTDIR)$(BINDIR)/ocamlmktop$(EXE)
+- 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
-@@ -139,7 +139,7 @@ lexer299.ml: lexer299.mll
- $(CAMLLEX) lexer299.mll
+@@ -234,8 +236,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO)
+ $(CAMLC) -o objinfo $(OBJINFO)
- #install::
--# cp ocaml299to3 $(BINDIR)/ocaml299to3$(EXE)
-+# cp ocaml299to3 $(DESTDIR)$(BINDIR)/ocaml299to3$(EXE)
-
- clean::
- rm -f ocaml299to3 lexer299.ml
-@@ -155,7 +155,7 @@ lexer301.ml: lexer301.mll
- $(CAMLLEX) lexer301.mll
-
install::
-- cp scrapelabels $(LIBDIR)
-+ cp scrapelabels $(DESTDIR)$(LIBDIR)
+- cp objinfo $(BINDIR)/ocamlobjinfo$(EXE)
+- cp objinfo_helper$(EXE) $(LIBDIR)/objinfo_helper$(EXE)
++ cp objinfo $(DESTDIR)$(BINDIR)/ocamlobjinfo$(EXE)
++ cp objinfo_helper$(EXE) $(DESTDIR)$(LIBDIR)/objinfo_helper$(EXE)
clean::
- rm -f scrapelabels lexer301.ml
-@@ -171,7 +171,7 @@ addlabels: addlabels.ml
- $(ADDLABELS_IMPORTS) addlabels.ml
-
- install::
-- cp addlabels $(LIBDIR)
-+ cp addlabels $(DESTDIR)$(LIBDIR)
-
- clean::
- rm -f addlabels
+ rm -f objinfo objinfo_helper$(EXE)
Modified: csw/mgar/pkg/ocaml/trunk/files/3-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/3-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -13,12 +13,11 @@
- rm -f $(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(LIBDIR)/stdlib.p.cmxa
- rm -f $(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(LIBDIR)/stdlib.p.a
- rm -f $(LIBDIR)/std_exit.p.cmx; \
-- ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx
-- rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
+ rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa; ln -s stdlib.cmxa $(DESTDIR)$(LIBDIR)/stdlib.p.cmxa
+ rm -f $(DESTDIR)$(LIBDIR)/stdlib.p.a; ln -s stdlib.a $(DESTDIR)$(LIBDIR)/stdlib.p.a
+ rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.cmx; \
-+ ln -s std_exit.cmx $(DESTDIR)$(LIBDIR)/std_exit.p.cmx
+ ln -s std_exit.cmx $(LIBDIR)/std_exit.p.cmx
+- rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
+ rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(DESTDIR)$(LIBDIR)/std_exit.p.o
installopt-prof:
Modified: csw/mgar/pkg/ocaml/trunk/files/8-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/8-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,6 +1,6 @@
--- a/byterun/Makefile.common
+++ b/byterun/Makefile.common
-@@ -45,14 +45,14 @@ ld.conf: ../config/Makefile
+@@ -45,14 +45,16 @@ ld.conf: ../config/Makefile
echo "$(LIBDIR)" >> ld.conf
install::
@@ -8,6 +8,8 @@
- cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A)
- cd $(LIBDIR); $(RANLIB) libcamlrun.$(A)
- if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
++ ginstall -m 755 -d $(DESTDIR)$(BINDIR)
++ ginstall -m 755 -d $(DESTDIR)$(LIBDIR)
+ cp ocamlrun$(EXE) $(DESTDIR)$(BINDIR)/ocamlrun$(EXE)
+ cp libcamlrun.$(A) $(DESTDIR)$(LIBDIR)/libcamlrun.$(A)
+ cd $(DESTDIR)$(LIBDIR); $(RANLIB) libcamlrun.$(A)
Modified: csw/mgar/pkg/ocaml/trunk/files/9-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/9-patch 2013-03-12 11:31:23 UTC (rev 20437)
+++ csw/mgar/pkg/ocaml/trunk/files/9-patch 2013-03-12 12:05:37 UTC (rev 20438)
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -268,53 +268,54 @@ opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+@@ -273,26 +273,26 @@ base.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
# Installation
install:
@@ -10,18 +10,17 @@
- if test -d $(MANDIR)/man$(MANEXT); then : ; \
- else $(MKDIR) $(MANDIR)/man$(MANEXT); fi
- cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
-+ 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)$(BINDIR); then : ; else $(MKDIR) $(DESDIR)$(BINDIR); fi
++ if test -d $(DESTDIR)$(LIBDIR); then : ; else $(MKDIR) $(DESDIR)$(LIBDIR); fi
+ if test -d $(DESTDIR)$(STUBLIBDIR); then : ; else $(MKDIR) $(DESTDIR)$(STUBLIBDIR); fi
+ if test -d $(DESTDIR)$(MANDIR)/man$(MANEXT); then : ; \
+ else $(MKDIR) $(DESTDIR)$(MANDIR)/man$(MANEXT); fi
+ cd $(DESTDIR)$(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \
- dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \
- dlltkanim.so
-- cd byterun; $(MAKE) install
+ dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \
+ dlltkanim.so
+ cd byterun; $(MAKE) install
- cp ocamlc $(BINDIR)/ocamlc$(EXE)
- cp ocaml $(BINDIR)/ocaml$(EXE)
-+ cd byterun; $(MAKE) install DESTDIR=$(DESTDIR)
+ cp ocamlc $(DESTDIR)$(BINDIR)/ocamlc$(EXE)
+ cp ocaml $(DESTDIR)$(BINDIR)/ocaml$(EXE)
cd stdlib; $(MAKE) install
@@ -41,21 +40,16 @@
- $(LIBDIR)
+ $(DESTDIR)$(LIBDIR)
cd tools; $(MAKE) install
- -$(MAKE) -C man install
+ -cd man; $(MAKE) install
for i in $(OTHERLIBRARIES); do \
- (cd otherlibs/$$i; $(MAKE) install) || exit $$?; \
- done
- cd ocamldoc; $(MAKE) install
-- if test -f ocamlopt; then $(MAKE) installopt; else :; fi
-- if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \
-+ if test -f ocamlopt; then $(MAKE) installopt ; else :; fi
-+ if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install ); \
+@@ -302,24 +302,24 @@ 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) PREFIX=$(DESTDIR)$(PREFIX) MANDIR=$(DESTDIR)$(MANDIR) DESTDIR=$(DESTDIR)\
++ BINDIR=$(DESTDIR)$(BINDIR) LIBDIR=$(DESTDIR)$(LIBDIR) MANDIR=$(DESTDIR)$(MANDIR) \
./build/partial-install.sh
# Installation of the native-code compiler
@@ -66,8 +60,7 @@
cd stdlib; $(MAKE) installopt
cd ocamldoc; $(MAKE) installopt
for i in $(OTHERLIBRARIES); \
-- do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done
-+ do (cd otherlibs/$$i; $(MAKE) installopt ) || exit $$?; done
+ 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
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