[Libreoffice] [PATCH] solenv/bin/ooinstall and undefined setup_vars array

Hi all!
I still use the build based build of LibreOffice, branch libreoffice-3-3.

There is an undefined $setup_vars array used in solenv/bin/ooinstall.
Attached is a patch to use the equvalent values from the global $ENV
array.

Anyone with access to the bootstrap repo may apply this please, thanks!


Regards,
Hanno

--- solenv/bin/ooinstall.orig   2010-11-07 22:59:58.620004432 +0100
+++ solenv/bin/ooinstall        2010-11-07 22:57:53.840004037 +0100
@@ -73,7 +73,7 @@
 # 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#
@@ -81,14 +81,14 @@
 $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";
 }