aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2011-09-16 22:03:39 +0200
committerAndras Timar <atimar@suse.com>2011-09-16 22:03:39 +0200
commitee5959f1e9004e0dd39d8708d8c66adc7a72b3c9 (patch)
treeae43d8a94e18f0de8a70ef5569162d13db7536fc
parent7e0aa0d881f50c9d8fa5c94249e5f892f3725b22 (diff)
key id build changes
-rw-r--r--translations/makefile.mk14
1 files changed, 6 insertions, 8 deletions
diff --git a/translations/makefile.mk b/translations/makefile.mk
index d1dba6d4d9b..b64bcf04c39 100644
--- a/translations/makefile.mk
+++ b/translations/makefile.mk
@@ -91,23 +91,21 @@ $(MISC)/sdf-template/en-US.sdf :
pot : $(MISC)/sdf-template/en-US.sdf
$(OO2PO) -P -i $< -o $(MISC)/pot
+ $(PERL) $(SOLARBINDIR)/addkeyid2pot.pl $(MISC)/pot
$(MISC)/sdf-l10n/%.sdf : $(MISC)/sdf-template/en-US.sdf
-.IF "$(WITH_LANG)" == "kid"
- $(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/keyidGen.pl $< $@.tmp
- sed -e "s/\ten-US\t/\tkid\t/" < $@.tmp > $@
- rm -f $@.tmp
-.ELSE
$(PYTHONCMD) $(SOLARBINDIR)/po2lo --skipsource -i $(PRJ)/source/$(@:b) -t $(MISC)/sdf-template/en-US.sdf -o $@ -l $(@:b)
-.ENDIF
-$(MISC)/merge.done : $(foreach,i,$(all_languages) $(MISC)/sdf-l10n/$i.sdf)
+$(MISC)/sdf-l10n/qtz.sdf : $(MISC)/sdf-template/en-US.sdf
+ $(PERL) $(SOLARBINDIR)/keyidGen.pl $< $@
+
+$(MISC)/merge.done : $(foreach,i,$(all_languages) $(MISC)/sdf-l10n/$i.sdf) $(MISC)/sdf-l10n/qtz.sdf
.IF "$(L10N_LOCK)" != "YES"
$(IFEXIST) $(MISC)/sdf $(THEN) $(RENAME) $(MISC)/sdf $(MISC)/sdf$(INPATH)_begone $(FI)
-rm -rf $(MISC)/sdf$(INPATH)_begone
-$(MKDIRHIER) $(MISC)/sdf
.ENDIF # "$(L10n_LOCK)" != "YES"
- $(PERL) $(SOLARVER)/$(INPATH)/bin$(UPDMINOREXT)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(MISC)/sdf && $(TOUCH) $@
+ $(PERL) $(SOLARBINDIR)/fast_merge.pl -sdf_files $(mktmp $<) -merge_dir $(MISC)/sdf && $(TOUCH) $@
$(COPY) $(PRJ)/localization_present.mk $(PRJ)/$(COMMON_OUTDIR)$(PROEXT)/inc
ALLTAR : $(MISC)/merge.done