[Libreoffice-commits] .: solenv/bin

[Jan Holesovsky]

 solenv/bin/ooinstall |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e3dcd77fe954c53b8146e5c279f9fafccf50bdd4
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date:   Wed Nov 10 04:58:40 2010 +0100

    Get rid of undefined $setup_vars array.

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 8a99097..dfca65e 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -75,7 +75,7 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
 # the installer to use the English localization of the file instead.
 $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
 
-$langs=$setup_vars{OOO_LANGS_LIST};
+$langs=$ENV{WITH_LANG};
 $langs='en-US' if $langs eq '';
 $langs =~ s/\s+/,/g;
 # FIXME: hack... we get a useless , at the end which makes it being e.g. zu#
@@ -83,14 +83,14 @@ $langs =~ s/\s+/,/g;
 $langs =~ s/,'/'/;
 
 $destdir='';
-if ( defined $setup_vars{OODESTDIR} &&
-     $setup_vars{OODESTDIR} ne "" ) {
-    $destdir = "-destdir \"$setup_vars{OODESTDIR}\"";
+if ( defined $ENV{OODESTDIR} &&
+     $ENV{OODESTDIR} ne "" ) {
+    $destdir = "-destdir \"$ENV{OODESTDIR}\"";
 }
 
 $strip='';
-if ( defined $setup_vars{OOO_STRIP} &&
-     $setup_vars{OOO_STRIP} eq "no" ) {
+if ( defined $ENV{DISABLE_STRIP} &&
+     $ENV{DISABLE_STRIP} eq "TRUE" ) {
     $strip = "-dontstrip";
 }