diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-21 11:50:25 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-21 11:50:44 +0200 |
| commit | 65d243296309acf39cde21f709240b7b6b23e093 (patch) | |
| tree | 4dfe938a34592e2e093188cfe1161a8ad9995491 /scp2 | |
| parent | 2147d08c78604c0b5d16e507a2fd5e3aa2ee6ccd (diff) | |
do not second-guess help langs for installation
Change-Id: I48484ca81008fe650aa9fa0eb561e3b2ff33399c
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/CustomTarget_langmacros.mk | 1 | ||||
| -rw-r--r-- | scp2/macros/macro.pl | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk index 6e91b850491f..48cb59633562 100644 --- a/scp2/CustomTarget_langmacros.mk +++ b/scp2/CustomTarget_langmacros.mk @@ -16,6 +16,7 @@ $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_Cust $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp $(call gb_Helper_abbreviate_dirs,\ export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ + export HELP_LANGS='$(gb_HELP_LANGS)' && \ $(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \ ) diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 1d5dd6c6c8bc..696bdd8b1493 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -36,20 +36,13 @@ if ( !defined $completelangiso_var) { exit 1; } -my $poorhelplocalizations_var = $ENV{WITH_POOR_HELP_LOCALIZATIONS}; -$poorhelplocalizations_var = $completelangiso_var if ( $poorhelplocalizations_var eq "ALL" ); -my %poorhelplocalizations; -foreach $lang (split (/ /, $poorhelplocalizations_var)) { - next if ( $lang eq "en-US"); - $poorhelplocalizations{$lang}++; -} - if (!args_require_build()) { print STDERR "No new languages, or config. Keeping old file\n"; exit 0; } my @completelangiso = split " +", $completelangiso_var; +my @helplangs = split " +", $ENV{HELP_LANGS}; open OUTFILE, ">$outfile" or die "$0 ERROR: cannot open $outfile for writing!\n"; @@ -151,8 +144,7 @@ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG { my $first = 1; print OUTFILE "#define EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(name) "; - foreach $lang (@completelangiso) { - next if ( $poorhelplocalizations{$lang} ); + foreach $lang (@helplangs) { print OUTFILE ";" unless $first; $first = 0; print OUTFILE "\\\n\tName ($lang) = EXTRAFILELISTNAME(HelpTarget/,name,/$lang)"; |