[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/bin

[René Engelhard]

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

New commits:
commit d839f5987ff634193384117dcd7b8e890ebc7b2c
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 2 02:22:53 2010 +0100

    move undefined(!) $setup_vars{'X'} to $ENV{'X'} in solenv/bin/ooinstall

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f848ea8..80f46b3 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -73,7 +73,8 @@ $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};
+# FIXME. Migrate to WITH_LANG?
+$langs=$ENV{OOO_LANGS_LIST};
 $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#
@@ -81,14 +82,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{OOO_STRIP} &&
+     $ENV{OOO_STRIP} eq "no" ) {
     $strip = "-dontstrip";
 }