From fbb48a21a8c2f4ba00f96544fafc8eb8e908aa10 Mon Sep 17 00:00:00 2001
From: Andras Timar <atimar@suse.com>
Date: Tue, 20 Sep 2011 16:42:32 +0200
Subject: localize.pl is not necessary

---
 solenv/bin/localize    |  8 +++++---
 solenv/bin/localize_sl | 13 -------------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100755 solenv/bin/localize_sl

(limited to 'solenv')

diff --git a/solenv/bin/localize b/solenv/bin/localize
index 9504e8ee37ed..ec51af9fddfd 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -4,12 +4,14 @@ if [ x${SOLARENV}x = xx ]; then
 exit 1
 fi
 
-# localize.pl calls localize_sl in solver bin directory which depends on dynamic
-# libraries in solver lib directory but has no correct RPATH (or equivalent):
 if [ "${OS?}" = MACOSX ]; then
     export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 else
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
 fi
 
-exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
+pushd $(pwd)
+cd ${SRC_ROOT}
+exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+popd
+
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
deleted file mode 100755
index d0db56084a19..000000000000
--- a/solenv/bin/localize_sl
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'setsolar'
-exit 1
-fi
-
-if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
-fi
-
-exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
-- 
cgit