solenv/gbuild/AllLangResTarget.mk | 7 ++++---
solenv/gbuild/Configuration.mk | 4 ++--
translations | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 3784cd9b03f9251ebbffd9a976363f685b3bc58a
Author: David Tardon <dtar...@redhat.com>
Date: Tue Oct 23 14:56:52 2012 +0200
change translations
Change-Id: Ic3a9c18e740cb896ed67a3635631fb6951a2ade9
diff --git a/translations b/translations
index 2548be5..424191b 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2548be535019c0a869c5759419c6964db5f82471
+Subproject commit 424191bbd2c5f73eb20bfca7c7b37a6bf25ac0e8
commit c55b916a1eeaf4f4caf50caaee96d949a49ff3e1
Author: David Tardon <dtar...@redhat.com>
Date: Tue Oct 23 14:31:45 2012 +0200
add missing dep on translations
Change-Id: I8c40e57a5a70d7a85b731f381e02ab46c71a8e68
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index eaaf482..fa7341a 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -111,6 +111,7 @@ else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
endif
endef
commit 4d4203a206c5e41c8c4ebccc99ca83ddd59e1717
Author: David Tardon <dtar...@redhat.com>
Date: Tue Oct 23 14:24:06 2012 +0200
wildcard is not necessary anymore
Change-Id: Ie52ce46671ec5c2db1e69f87225102c783f8ca16
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 866593d..eaaf482 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -110,7 +110,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
endif
endef
@@ -123,8 +123,8 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(wildcard
$(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
endif
endef
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index f8b5114..d1d4aeb 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -273,9 +273,9 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
- $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
+ $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
$(call gb_XcuMergeTarget_get_target,$(1)) : \
- SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
+ SDF := $(gb_SDFLOCATION)/$(dir $(1))localize.sdf
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
