summaryrefslogtreecommitdiff
path: root/solenv/gbuild/AutoInstall.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-06-22 21:02:05 +0200
committerMichael Stahl <mstahl@redhat.com>2015-06-22 21:02:05 +0200
commit70cba374f6862bb6b3568927267fc9e1fe3c0922 (patch)
treea95d34aa7e5d9cf13cfa4326991b5b78c96a037a /solenv/gbuild/AutoInstall.mk
parent06850097f74e1ef93a90d45a8c3426976f3fe902 (diff)
scp2: add AutoInstall support for executables with COMPONENTCONDITION
Change-Id: I36f14d9ba08ab2473a555681b934b8b35cfa06b2
Diffstat (limited to 'solenv/gbuild/AutoInstall.mk')
-rw-r--r--solenv/gbuild/AutoInstall.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 282b02a93e9a..11ff644ee8a3 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -60,7 +60,7 @@ endif
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../program/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
- echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;)
+ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))" >> $@;)
$(foreach jar,$(gb_Jar_MODULE_$*),\
echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst .,_,$(subst -,_,$(jar))),$(jar).jar)' >> $@;)
$(foreach pkg,$(gb_Package_MODULE_$*),\