aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-09-23 14:39:14 +0200
committerDavid Tardon <dtardon@redhat.com>2012-09-23 14:39:14 +0200
commitfd4f521a880aec5f183f02ed5f85277d78741e75 (patch)
tree000da404748aac46a4999952648dea97c585844b
parent1ab13d81ae24341421396f45d5eaef63508fad6d (diff)
add missing dep
-rw-r--r--translations/CustomTarget_translate.mk3
-rw-r--r--translations/prj/makefile.mk1
2 files changed, 2 insertions, 2 deletions
diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 2e363cb7154..07fdf2deaa6 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -41,7 +41,8 @@ endif
#TODO: remove localization_present.mk when translations are in tail_build
$(translations_DIR)/merge.done : \
$(foreach lang,$(translations_LANGS),$(translations_DIR)/sdf-l10n/$(lang).sdf) \
- $(translations_DIR)/sdf-l10n/qtz.sdf
+ $(translations_DIR)/sdf-l10n/qtz.sdf \
+ $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MRG,2)
$(call gb_Helper_abbreviate_dirs, \
rm -rf $(translations_DIR)/sdf && mkdir $(translations_DIR)/sdf && \
diff --git a/translations/prj/makefile.mk b/translations/prj/makefile.mk
deleted file mode 100644
index 0997622e00f..00000000000
--- a/translations/prj/makefile.mk
+++ /dev/null
@@ -1 +0,0 @@
-.INCLUDE : gbuildbridge.mk