summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Meyer-Thurow <h.mth@web.de>2010-11-10 04:58:40 +0100
committerJan Holesovsky <kendy@suse.cz>2010-11-10 05:09:01 +0100
commitd04442e15367319401180a0d9e4ce1a752788a77 (patch)
treee21853e80dcaf416937b6d84ffc499833b056b75
parent8126991c5d177ce5a99a0d1ebc8d859a7e0282cd (diff)
Get rid of undefined $setup_vars array.
-rwxr-xr-xsolenv/bin/ooinstall7
1 files changed, 3 insertions, 4 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 547ad4418..dfca65e2f 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -75,8 +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;
-# FIXME. Migrate to WITH_LANG?
-$langs=$ENV{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#
@@ -90,8 +89,8 @@ if ( defined $ENV{OODESTDIR} &&
}
$strip='';
-if ( defined $ENV{OOO_STRIP} &&
- $ENV{OOO_STRIP} eq "no" ) {
+if ( defined $ENV{DISABLE_STRIP} &&
+ $ENV{DISABLE_STRIP} eq "TRUE" ) {
$strip = "-dontstrip";
}