diff options
author | David Tardon <dtardon@redhat.com> | 2012-10-23 14:24:06 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-10-23 14:57:53 +0200 |
commit | 4d4203a206c5e41c8c4ebccc99ca83ddd59e1717 (patch) | |
tree | 47b55bcf01386b10599d57668f35f5f7906b4eaf /solenv | |
parent | 1d16f59023b1b19d01ca69b8c9735be6d3baf5d9 (diff) |
wildcard is not necessary anymore
Change-Id: Ie52ce46671ec5c2db1e69f87225102c783f8ca16
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 6 | ||||
-rw-r--r-- | solenv/gbuild/Configuration.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 866593d12f90..eaaf482fcae3 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 f8b511484b98..d1d4aeb036c6 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 |