[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/Executable.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 96204ecf7418eb1e94992869c3c1439359004adf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jun 17 14:39:33 2013 +0200

    do not copy executables into instdir yet (by default)
    
    It causes some weird problems with solenv/bin/linkoo.
    
    Change-Id: Ic1613394ec3f0fe508ca813c2600f9bc5439dce7

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 7611ea3..d616e1c 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -70,7 +70,9 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_tar
 $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_install_target,$(1))
 $(call gb_Executable_Executable_platform,$(1),$(2))
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
 $(call gb_Helper_install,Executable,$(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))