[csw-devel] SF.net SVN: gar:[21458] csw/mgar/pkg/slib/trunk

[pfelecan at users.sourceforge.net]

Revision: 21458
          http://gar.svn.sourceforge.net/gar/?rev=21458&view=rev
Author:   pfelecan
Date:     2013-07-08 16:33:59 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
slib/trunk: correct default scheme library path

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

Added Paths:
-----------
    csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch

Modified: csw/mgar/pkg/slib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/slib/trunk/Makefile	2013-07-08 15:52:29 UTC (rev 21457)
+++ csw/mgar/pkg/slib/trunk/Makefile	2013-07-08 16:33:59 UTC (rev 21458)
@@ -16,6 +16,7 @@
 #PATCHFILES		+=	0003-Adapt-to-Guile-2.patch
 PATCHFILES		+=	0004-Force-libraries-directory.patch
 PATCHFILES		+=	0005-Do-not-compress-info-file.patch
+PATCHFILES		+=	0006-Correct-default-scheme-library-path.patch
 
 PACKAGES					=	CSWslib
 CATALOGNAME_CSWslib			=	slib

Added: csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch
===================================================================
--- csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch	                        (rev 0)
+++ csw/mgar/pkg/slib/trunk/files/0006-Correct-default-scheme-library-path.patch	2013-07-08 16:33:59 UTC (rev 21458)
@@ -0,0 +1,39 @@
+From 9c6742763d01e5dafd1ea443a9a1e2a5fb4a21e0 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Mon, 8 Jul 2013 18:28:39 +0200
+Subject: [PATCH] Correct default scheme library path
+
+---
+ slib.sh | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/slib.sh b/slib.sh
+index fd0ef04..bf4c69c 100644
+--- a/slib.sh
++++ b/slib.sh
+@@ -106,19 +106,15 @@ case $implementation in
+ 	fi
+      fi
+      if [ -z "${SCHEME_LIBRARY_PATH}" ]; then
+-       if [ -d /usr/local/lib/slib/ ]; then
+-	  SCHEME_LIBRARY_PATH=/usr/local/lib/slib/
+-       elif [ -d /usr/share/slib/ ]; then
+-	  SCHEME_LIBRARY_PATH=/usr/share/slib/
+-       fi
+-     export SCHEME_LIBRARY_PATH
++		 SCHEME_LIBRARY_PATH=/opt/csw/share/guile/slib
++		 export SCHEME_LIBRARY_PATH
+      fi;;
+ esac
+ 
+ # for gambit
+ case $implementation in
+   gam) if [ -z "${LD_LIBRARY_PATH}" ]; then
+-	LD_LIBRARY_PATH=/usr/local/lib
++	LD_LIBRARY_PATH=/opt/csw/lib
+ 	export LD_LIBRARY_PATH
+ 	fi;;
+ esac
+-- 
+1.8.3.1
+

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