[Libreoffice-commits] .: l10ntools/source solenv/bin

[Thorsten Behrens]

 l10ntools/source/localize.cxx |    2 +-
 solenv/bin/localize           |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8bd171e786ab8b20544334434d35e43fa46d39f4
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Sep 30 11:18:59 2011 +0200

    Make translation tools cross-build aware
    
    Build-time tools should use build-time inpath...

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index bb97551..2ed64a8 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -340,7 +340,7 @@ void SourceTreeLocalizer::WorkOnFile(
             sDel=ByteString("/");
 #endif
             ByteString sPath1( Export::GetEnv("SOLARVER") );
-            ByteString sPath2( Export::GetEnv("INPATH") );
+            ByteString sPath2( Export::GetEnv("INPATH_FOR_BUILD") );
             ByteString sPath3( "bin" );
             ByteString sExecutable( sPath1 );
 #if defined(WNT)
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 732cf85..fc1ae47 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -5,12 +5,12 @@ exit 1
 fi
 
 if [ "${OS?}" = MACOSX ]; then
-    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH_FOR_BUILD?}/lib
 else
-    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH_FOR_BUILD?}/lib
 fi
 
 pushd $(pwd)
 cd ${SRC_ROOT}
-exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+exec $SOLARVERSION/$INPATH_FOR_BUILD/bin/localize_sl "$@"
 popd