diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 8e6313223b10..34c32a97ad15 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -115,7 +115,7 @@ gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf define gb_ScpMergeTarget__command $(call gb_Output_announce,$(2),$(true),SUM,1) $(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $(SCP_SDF) -l all \ + $(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $(SCP_SDF) -l all \ ) endef @@ -123,7 +123,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET) - $(call gb_ScpMergeTarget__command,$@,$*,$<) + $(call gb_ScpMergeTarget__command,$@,$*) .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%) $(call gb_ScpMergeTarget_get_clean_target,%) : @@ -132,6 +132,7 @@ $(call gb_ScpMergeTarget_get_clean_target,%) : # gb_ScpMergeTarget_ScpMergeTarget(<target>) define gb_ScpMergeTarget_ScpMergeTarget +$(call gb_ScpMergeTarget_get_target,$(1)) : private SCP_SOURCE := $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_source,$(1)) $(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call gb_ScpMergeTarget_get_target,$(1))).dir $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SDF := $(gb_SDFLOCATION)/$(dir $(1))/localize.sdf |