summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Executable.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-06-19 14:50:02 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-09 22:09:16 +0200
commit573b8543cb41b88dd6e255a3c566a31a881a3e7e (patch)
tree6c5e913f53099980c2a0493048a3f5174a8e90a8 /solenv/gbuild/Executable.mk
parent3cc8feff1b81ddfe4eafa5cf23e98b1c536f5f1a (diff)
start to use instdir for subsequentcheck tests; avoid make dev-install
This commit breaks linkoo. make dev-install continues to work as before but it's not necessary to use it anymore. make check now uses files copied into instdir by gbuild. TODO: fix remaining issues so that instdir is the same as install/. Change-Id: I66836170f0922ee9ba204a61ffacc30d9e9a5d98
Diffstat (limited to 'solenv/gbuild/Executable.mk')
-rw-r--r--solenv/gbuild/Executable.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 0450c6f89c63..1640cece276d 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -69,13 +69,11 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2))
-ifneq ($(gb_RUNNABLE_INSTDIR),)
$(if $(call gb_Executable__get_dir_for_exe,$(1)), \
$(call gb_Helper_install,$(call gb_Executable_get_target,$(1)), \
$(call gb_Executable_get_install_target,$(1)), \
$(call gb_LinkTarget_get_target,$(2))) \
)
-endif
$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Executable)
$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))