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

[cgrzemba at users.sourceforge.net]

Revision: 20439
          http://gar.svn.sourceforge.net/gar/?rev=20439&view=rev
Author:   cgrzemba
Date:     2013-03-12 14:12:29 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
ocaml/trunk: fix install patch

Modified Paths:
--------------
    csw/mgar/pkg/ocaml/trunk/Makefile
    csw/mgar/pkg/ocaml/trunk/files/3-patch
    csw/mgar/pkg/ocaml/trunk/files/8-patch

Modified: csw/mgar/pkg/ocaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ocaml/trunk/Makefile	2013-03-12 12:05:37 UTC (rev 20438)
+++ csw/mgar/pkg/ocaml/trunk/Makefile	2013-03-12 14:12:29 UTC (rev 20439)
@@ -58,15 +58,17 @@
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libgraphics.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libmldbm.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libnums.a
-CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libstr.a
+# CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libstr.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libthreads.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libthreadsnat.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libunix.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/vmthreads/libvmthreads.a
 CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/liblabltk.a
-CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/libtkanim.a
+# CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/labltk/libtkanim.a
+CHECKPKG_OVERRIDES_CSWocaml += discouraged-path-in-pkgmap|/opt/csw/lib/ocaml/libcamlstr.a
 
 
+
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib

Modified: csw/mgar/pkg/ocaml/trunk/files/3-patch
===================================================================
--- csw/mgar/pkg/ocaml/trunk/files/3-patch	2013-03-12 12:05:37 UTC (rev 20438)
+++ csw/mgar/pkg/ocaml/trunk/files/3-patch	2013-03-12 14:12:29 UTC (rev 20439)
@@ -28,3 +28,14 @@
  
  stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx)
  	$(CAMLOPT) -a -o stdlib.p.cmxa $(OBJS:.cmo=.p.cmx)
+--- a/stdlib/Makefile
++++ b/stdlib/Makefile
+@@ -32,7 +32,7 @@ installopt-noprof:
+ 	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 $(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 $(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 12:05:37 UTC (rev 20438)
+++ csw/mgar/pkg/ocaml/trunk/files/8-patch	2013-03-12 14:12:29 UTC (rev 20439)
@@ -8,8 +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)
++	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)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.