diff options
| author | Andras Timar <atimar@suse.com> | 2012-12-12 10:07:35 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-12-14 12:20:13 +0100 |
| commit | c7b1a2fe811f1d5a233cd790cec9067cea246845 (patch) | |
| tree | 7d7a4ea48a67b54f8d1848e75db97341fdbf4275 /solenv | |
| parent | a9a734a680dda8c177f92cf2f14061c9b785ec8d (diff) | |
Make KeyID (qtz) work again
Conflicts:
configure.ac
Change-Id: I67b2ce4ae647150aeace72c542a5838940d2c058
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/ooinstall | 15 | ||||
| -rw-r--r-- | solenv/inc/postset.mk | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index a4ce6ced1906..3b086c633348 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -91,19 +91,8 @@ $ENV{LOCAL_COMMON_OUT} = $ENV{OUT}; $ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1; my @larr; -$langs=$ENV{WITH_LANG}; -$langs='en-US' if $langs eq ''; -if ($langs eq 'ALL') { - opendir(DIR,$ENV{L10N_MODULE} . "/source"); - @larr = readdir(DIR); - @larr = grep { $_ ne '.' } @larr; - @larr = grep { $_ ne '..' } @larr; - @larr = (@larr,"en-US"); - closedir(DIR); -} -else { - @larr = grep { $_ ne '' } split(/ /, $langs); -} +$langs=$ENV{WITH_LANG_LIST}; +@larr = grep { $_ ne '' } split(/ /, $langs); $langs = join (",", @larr); $destdir=''; diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index e9632ddc3528..0762011a546e 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -23,4 +23,4 @@ defaultlangiso=en-US # Complete list of all supported localizations (ISO codes) .INCLUDE : langlist.mk -alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG))))) +alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(WITH_LANG_LIST))) |