[csw-devel] SF.net SVN: gar:[20197] csw/mgar/pkg/ocaml/trunk

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Tue Jan 22 10:00:47 CET 2013


Revision: 20197
          http://gar.svn.sourceforge.net/gar/?rev=20197&view=rev
Author:   cgrzemba
Date:     2013-01-22 09:00:45 +0000 (Tue, 22 Jan 2013)
Log Message:
-----------
ocaml/trunk: add variable DESTDIR to install target

Modified Paths:
--------------
    csw/mgar/pkg/ocaml/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ocaml/trunk/files/0-patch
    csw/mgar/pkg/ocaml/trunk/files/10-patch
    csw/mgar/pkg/ocaml/trunk/files/12-patch
    csw/mgar/pkg/ocaml/trunk/files/13-patch
    csw/mgar/pkg/ocaml/trunk/files/14-patch
    csw/mgar/pkg/ocaml/trunk/files/15-patch
    csw/mgar/pkg/ocaml/trunk/files/16-patch
    csw/mgar/pkg/ocaml/trunk/files/17-patch
    csw/mgar/pkg/ocaml/trunk/files/18-patch
    csw/mgar/pkg/ocaml/trunk/files/19-patch
    csw/mgar/pkg/ocaml/trunk/files/2-patch
    csw/mgar/pkg/ocaml/trunk/files/20-patch
    csw/mgar/pkg/ocaml/trunk/files/21-patch
    csw/mgar/pkg/ocaml/trunk/files/3-patch
    csw/mgar/pkg/ocaml/trunk/files/4-patch
    csw/mgar/pkg/ocaml/trunk/files/5-patch
    csw/mgar/pkg/ocaml/trunk/files/6-patch
    csw/mgar/pkg/ocaml/trunk/files/7-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-01-21 21:58:07 UTC (rev 20196)
+++ csw/mgar/pkg/ocaml/trunk/Makefile	2013-01-22 09:00:45 UTC (rev 20197)
@@ -9,27 +9,55 @@
 
 MASTER_SITES = http://caml.inria.fr/pub/distrib/ocaml-3.11/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
+GARCOMPILER = GCC4
 
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # UPSTREAM_MASTER_SITES = 
 
-RUNTIME_DEP_PKGS_CSWocaml = CSWlibx11
+PATCHFILES += 0-patch
+PATCHFILES += 10-patch
+PATCHFILES += 12-patch
+PATCHFILES += 13-patch
+PATCHFILES += 14-patch
+PATCHFILES += 15-patch
+PATCHFILES += 16-patch
+PATCHFILES += 17-patch
+PATCHFILES += 18-patch
+PATCHFILES += 19-patch
+PATCHFILES += 2-patch
+PATCHFILES += 20-patch
+PATCHFILES += 21-patch
+PATCHFILES += 3-patch
+PATCHFILES += 4-patch
+PATCHFILES += 5-patch
+PATCHFILES += 6-patch
+PATCHFILES += 7-patch
+PATCHFILES += 8-patch
+PATCHFILES += 9-patch
+
+RUNTIME_DEP_PKGS_CSWocaml += CSWlibtcl8-5
+RUNTIME_DEP_PKGS_CSWocaml += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWocaml += CSWlibtk8-5
+
 LICENSE = LICENSE
 
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-BUILD_ARGS = world.opt
+# BUILD_ARGS = world.opt
+BUILD_ARGS = world opt
 #CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += -bindir $(bindir)
-CONFIGURE_ARGS += -libdir $(libdir)
+# CONFIGURE_ARGS += -bindir $(bindir)
+# CONFIGURE_ARGS += -libdir $(libdir)
 CONFIGURE_ARGS += -mandir $(mandir)
 CONFIGURE_ARGS += -prefix $(prefix)
-CONFIGURE_ARGS += -cc "$(CC) $(CFLAGS)"
-CONFIGURE_ARGS += -x11include $(prefix)/X11/include
-CONFIGURE_ARGS += -x11lib $(prefix)/X11/lib
+CONFIGURE_ARGS += -verbose
+# CONFIGURE_ARGS += -cc "$(CC) $(CFLAGS)"
+# CONFIGURE_ARGS += -x11include $(prefix)/X11/include
+# CONFIGURE_ARGS += -x11lib $(prefix)/X11/lib
+INSTALL_ARGS += PWD=${PWD}/$(WORKSRC)
 
 TEST_TARGET =
 

Added: csw/mgar/pkg/ocaml/trunk/files/0-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/0-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/0-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,20 @@
+--- a/camlp4/man/Makefile
++++ b/camlp4/man/Makefile
+@@ -8,12 +8,12 @@ ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
+ include ../config/Makefile.base
+ 
+ install-local:
+-	if test -n '$(MANDIR)'; then \
+-	  $(MKDIR) $(MANDIR)/man1 ; \
+-	  cp $(TARGET) $(MANDIR)/man1/. ; \
++	if test -n '$(DESTDIR)$(MANDIR)'; then \
++	  $(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; \
+ 	fi
+ 

Added: csw/mgar/pkg/ocaml/trunk/files/10-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/10-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/10-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,27 @@
+--- a/otherlibs/Makefile.shared
++++ b/otherlibs/Makefile.shared
+@@ -58,16 +58,16 @@ lib$(CLIBNAME).$(A): $(COBJS)
+ 
+ install::
+ 	if test -f dll$(CLIBNAME)$(EXT_DLL); then \
+-	  cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
+-	cp lib$(CLIBNAME).$(A) $(LIBDIR)/
+-	cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
+-	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/
+-	if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi
++	  cp dll$(CLIBNAME)$(EXT_DLL) $(DESTDIR)$(STUBLIBDIR)/; fi
++	cp lib$(CLIBNAME).$(A) $(DESTDIR)$(LIBDIR)/
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A)
++	cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(DESTDIR)$(LIBDIR)/
++	if test -n "$(HEADERS)"; then cp $(HEADERS) $(DESTDIR)$(LIBDIR)/caml/; fi
+ 
+ installopt:
+-	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/
+-	cd $(LIBDIR); $(RANLIB) $(LIBNAME).a
+-	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi
++	cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(DESTDIR)$(LIBDIR)/
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) $(LIBNAME).a
++	if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(DESTDIR)$(LIBDIR)/; fi
+ 
+ partialclean:
+ 	rm -f *.cm*

Added: csw/mgar/pkg/ocaml/trunk/files/12-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/12-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/12-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/otherlibs/labltk/browser/Makefile.shared
++++ b/otherlibs/labltk/browser/Makefile.shared
+@@ -49,7 +49,7 @@ help.ml:
+ 
+ install:
+ 	if test -f ocamlbrowser$(EXE); then : ; \
+-	  cp ocamlbrowser$(EXE) $(BINDIR); fi
++	  cp ocamlbrowser$(EXE) $(DESTDIR)$(BINDIR); fi
+ 
+ clean:
+ 	rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O)

Added: csw/mgar/pkg/ocaml/trunk/files/13-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/13-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/13-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/otherlibs/labltk/tkanim/Makefile
++++ b/otherlibs/labltk/tkanim/Makefile
+@@ -59,7 +59,7 @@ clean:
+ install:
+ 	cp tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR)
+ 	if [ -f dlltkanim$(EXT_DLL) ]; then \
+-		cp dlltkanim$(EXT_DLL) $(STUBLIBDIR)/; \
++		cp dlltkanim$(EXT_DLL) $(DESTDIR)$(STUBLIBDIR)/; \
+ 	fi
+ 
+ installopt:

Added: csw/mgar/pkg/ocaml/trunk/files/14-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/14-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/14-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,15 @@
+--- a/otherlibs/labltk/lib/Makefile
++++ b/otherlibs/labltk/lib/Makefile
+@@ -62,9 +62,9 @@ install:
+ 	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

Added: csw/mgar/pkg/ocaml/trunk/files/15-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/15-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/15-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/otherlibs/labltk/support/Makefile.common
++++ b/otherlibs/labltk/support/Makefile.common
+@@ -8,7 +8,7 @@ LIBNAME=labltk
+ 
+ include $(TOPDIR)/config/Makefile
+ 
+-INSTALLDIR=$(LIBDIR)/$(LIBNAME)
++INSTALLDIR=$(DESTDIR)$(LIBDIR)/$(LIBNAME)
+ 
+ ## Tools from the Objective Caml distribution
+ 

Added: csw/mgar/pkg/ocaml/trunk/files/16-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/16-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/16-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/otherlibs/labltk/support/Makefile
++++ b/otherlibs/labltk/support/Makefile
+@@ -30,7 +30,7 @@ install:
+ 	cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A)
+ 	cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A)
+ 	if test -f dll$(LIBNAME)$(EXT_DLL); then \
+-	   cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi
++	   cp dll$(LIBNAME)$(EXT_DLL) $(DESTDIR)$(STUBLIBDIR)/; fi
+ 
+ installopt:
+ 	@if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi

Added: csw/mgar/pkg/ocaml/trunk/files/17-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/17-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/17-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,19 @@
+--- a/otherlibs/dynlink/Makefile
++++ b/otherlibs/dynlink/Makefile
+@@ -66,12 +66,12 @@ extract_crc: dynlink.cma extract_crc.cmo
+ 	$(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo
+ 
+ install:
+-	cp dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR)
+-	cp extract_crc $(LIBDIR)/extract_crc$(EXE)
++	cp dynlink.cmi dynlink.cma dynlink.mli $(DESTDIR)$(LIBDIR)
++	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)
+ 
+ partialclean:
+ 	rm -f extract_crc *.cm[ioax] *.cmxa

Added: csw/mgar/pkg/ocaml/trunk/files/18-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/18-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/18-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,21 @@
+--- a/otherlibs/threads/Makefile
++++ b/otherlibs/threads/Makefile
+@@ -100,12 +100,12 @@ clean: partialclean
+ 	rm -f pervasives.mli marshal.mli unix.mli
+ 
+ install:
+-	if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi
+-	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
+ 
+ installopt:
+ 

Added: csw/mgar/pkg/ocaml/trunk/files/19-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/19-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/19-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,33 @@
+--- a/otherlibs/systhreads/Makefile
++++ b/otherlibs/systhreads/Makefile
+@@ -76,19 +76,19 @@ clean: partialclean
+ 	rm -f $(GENFILES)
+ 
+ install:
+-	if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi
+-	cp libthreads.a $(LIBDIR)/libthreads.a
+-	cd $(LIBDIR); $(RANLIB) libthreads.a
+-	if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi
+-	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)
++	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
++	if test -d $(DESTDIR)$(LIBDIR)/threads; then :; else mkdir $(DESTDIR)$(LIBDIR)/threads; fi
++	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)
+ 
+ installopt:
+-	cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a
+-	cd $(LIBDIR); $(RANLIB) libthreadsnat.a
+-	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads
+-	cd $(LIBDIR)/threads; $(RANLIB) threads.a
++	cp libthreadsnat.a $(DESTDIR)$(LIBDIR)/libthreadsnat.a
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libthreadsnat.a
++	cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(DESTDIR)$(LIBDIR)/threads
++	cd $(DESTDIR)$(LIBDIR)/threads; $(RANLIB) threads.a
+ 
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
+ 

Added: csw/mgar/pkg/ocaml/trunk/files/2-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/2-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/2-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,79 @@
+--- a/tools/Makefile.shared
++++ b/tools/Makefile.shared
+@@ -51,9 +51,9 @@ clean::
+ 	rm -f ocamldep.opt
+ 
+ install::
+-	cp ocamldep $(BINDIR)/ocamldep$(EXE)
++	cp ocamldep $(DESTDIR)$(BINDIR)/ocamldep$(EXE)
+ 	if test -f ocamldep.opt; \
+-	  then cp ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi
++	  then cp ocamldep.opt $(DESTDIR)$(BINDIR)/ocamldep.opt$(EXE); else :; fi
+ 
+ # The profiler
+ 
+@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo
+ 	$(CAMLC) $(LINKFLAGS) -o ocamlcp 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)
+ 
+ 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
+ 	cp ../myocamlbuild_config.ml .
+ 
+ install::
+-	cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE)
++	cp ocamlmklib $(DESTDIR)$(BINDIR)/ocamlmklib$(EXE)
+ 
+ clean::
+ 	rm -f ocamlmklib
+@@ -121,7 +121,7 @@ clean::
+ # To make custom toplevels (see Makefile/Makefile.nt)
+ 
+ install::
+-	cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE)
++	cp ocamlmktop $(DESTDIR)$(BINDIR)/ocamlmktop$(EXE)
+ 
+ clean::
+ 	rm -f ocamlmktop
+@@ -139,7 +139,7 @@ lexer299.ml: lexer299.mll
+ 	$(CAMLLEX) lexer299.mll
+ 
+ #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)
+ 
+ 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

Added: csw/mgar/pkg/ocaml/trunk/files/20-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/20-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/20-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/debugger/Makefile.shared
++++ b/debugger/Makefile.shared
+@@ -83,7 +83,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS)
+ 	$(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS)
+ 
+ install:
+-	cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE)
++	cp ocamldebug$(EXE) $(DESTDIR)$(BINDIR)/ocamldebug$(EXE)
+ 
+ clean::
+ 	rm -f ocamldebug$(EXE)

Added: csw/mgar/pkg/ocaml/trunk/files/21-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/21-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/21-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,16 @@
+--- a/ocamldoc/Makefile
++++ b/ocamldoc/Makefile
+@@ -37,10 +37,10 @@ OCAMLDOC_LIBCMA=odoc_info.cma
+ OCAMLDOC_LIBCMI=odoc_info.cmi
+ OCAMLDOC_LIBCMXA=odoc_info.cmxa
+ OCAMLDOC_LIBA=odoc_info.a
+-INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
++INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/ocamldoc
+ INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
+-INSTALL_BINDIR=$(OCAMLBIN)
+-INSTALL_MANODIR=$(MANDIR)/man3
++INSTALL_BINDIR=$(DESTDIR)$(OCAMLBIN)
++INSTALL_MANODIR=$(DESTDIR)$(MANDIR)/man3
+ 
+ INSTALL_MLIS=odoc_info.mli
+ INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)

Added: csw/mgar/pkg/ocaml/trunk/files/3-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/3-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/3-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,31 @@
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -25,19 +25,19 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cmx
+ installopt: installopt-default installopt-$(PROFILING)
+ 
+ installopt-default:
+-	cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR)
+-	cd $(LIBDIR); $(RANLIB) stdlib.a
++	cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(DESTDIR)$(LIBDIR)
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) stdlib.a
+ 
+ installopt-noprof:
+-	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
++	rm -f $(DESTDIR)$(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o
+ 
+ installopt-prof:
+-	cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR)
+-	cd $(LIBDIR); $(RANLIB) stdlib.p.a
++	cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(DESTDIR)$(LIBDIR)
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) stdlib.p.a
+ 
+ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
+ 	$(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)

Added: csw/mgar/pkg/ocaml/trunk/files/4-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/4-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/4-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- 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
+ 
+ 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)
+ 
+ stdlib.cma: $(OBJS)
+ 	$(CAMLC) -a -o stdlib.cma $(OBJS)

Added: csw/mgar/pkg/ocaml/trunk/files/5-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/5-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/5-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -14,7 +14,7 @@
+ 
+ include ../config/Makefile
+ 
+-DIR=$(MANDIR)/man$(MANEXT)
++DIR=$(DESTDIR)$(MANDIR)/man$(MANEXT)
+ 
+ install:
+ 	for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done

Added: csw/mgar/pkg/ocaml/trunk/files/6-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/6-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/6-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,23 @@
+--- a/asmrun/Makefile
++++ b/asmrun/Makefile
+@@ -58,15 +58,15 @@ libasmrunp.a: $(POBJS)
+ install: install-default install-$(PROFILING)
+ 
+ install-default:
+-	cp libasmrun.a $(LIBDIR)/libasmrun.a
+-	cd $(LIBDIR); $(RANLIB) libasmrun.a
++	cp libasmrun.a $(DESTDIR)$(LIBDIR)/libasmrun.a
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrun.a
+ 
+ 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
+ 
+ install-prof:
+-	cp libasmrunp.a $(LIBDIR)/libasmrunp.a
+-	cd $(LIBDIR); $(RANLIB) libasmrunp.a
++	cp libasmrunp.a $(DESTDIR)$(LIBDIR)/libasmrunp.a
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libasmrunp.a
+ 
+ power.o: power-$(SYSTEM).o
+ 	cp power-$(SYSTEM).o power.o

Added: csw/mgar/pkg/ocaml/trunk/files/7-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/7-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/7-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,11 @@
+--- a/byterun/Makefile
++++ b/byterun/Makefile
+@@ -48,7 +48,7 @@ libcamlrun_shared.so: $(PICOBJS)
+ 
+ install::
+ 	if test -f libcamlrun_shared.so; then \
+-	  cp libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi
++	  cp libcamlrun_shared.so $(DESTDIR)$(LIBDIR)/libcamlrun_shared.so; fi
+ 
+ clean::
+ 	rm -f libcamlrun_shared.so

Added: csw/mgar/pkg/ocaml/trunk/files/8-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/8-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/8-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,23 @@
+--- a/byterun/Makefile.common
++++ b/byterun/Makefile.common
+@@ -45,14 +45,14 @@ ld.conf: ../config/Makefile
+ 	echo "$(LIBDIR)" >> ld.conf
+ 
+ install::
+-	cp ocamlrun$(EXE) $(BINDIR)/ocamlrun$(EXE)
+-	cp libcamlrun.$(A) $(LIBDIR)/libcamlrun.$(A)
+-	cd $(LIBDIR); $(RANLIB) libcamlrun.$(A)
+-	if test -d $(LIBDIR)/caml; then : ; else mkdir $(LIBDIR)/caml; fi
++	cp ocamlrun$(EXE) $(DESTDIR)$(BINDIR)/ocamlrun$(EXE)
++	cp libcamlrun.$(A) $(DESTDIR)$(LIBDIR)/libcamlrun.$(A)
++	cd $(DESTDIR)$(LIBDIR); $(RANLIB) libcamlrun.$(A)
++	if test -d $(DESTDIR)$(LIBDIR)/caml; then : ; else mkdir $(DESTDIR)$(LIBDIR)/caml; fi
+ 	for i in $(PUBLIC_INCLUDES); do \
+-	  sed -f ../tools/cleanup-header $$i > $(LIBDIR)/caml/$$i; \
++	  sed -f ../tools/cleanup-header $$i > $(DESTDIR)$(LIBDIR)/caml/$$i; \
+ 	done
+-	cp ld.conf $(LIBDIR)/ld.conf
++	cp ld.conf $(DESTDIR)$(LIBDIR)/ld.conf
+ .PHONY: install
+ 
+ 

Added: csw/mgar/pkg/ocaml/trunk/files/9-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/9-patch	                        (rev 0)
+++ csw/mgar/pkg/ocaml/trunk/files/9-patch	2013-01-22 09:00:45 UTC (rev 20197)
@@ -0,0 +1,82 @@
+--- a/Makefile
++++ b/Makefile
+@@ -268,53 +268,54 @@ opt.opt: checkstack runtime core ocaml opt-core ocamlc.opt otherlibraries \
+ 
+ # 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 $(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)$(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
+-	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
+-	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 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)
+ 	cd tools; $(MAKE) install
+ 	-$(MAKE) -C man 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 ); \
+ 	   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)\
+ 	  ./build/partial-install.sh
+ 
+ # Installation of the native-code compiler
+ installopt:
+ 	cd asmrun; $(MAKE) install
+-	cp ocamlopt $(BINDIR)/ocamlopt$(EXE)
++	cp ocamlopt $(DESTDIR)$(BINDIR)/ocamlopt$(EXE)
+ 	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
+ 	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
+ 
+ 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