From 8c5a96fcc44f060467680b5d9104bba2f091d4b7 Mon Sep 17 00:00:00 2001
From: "Philipp Lohmann [pl]" <Philipp.Lohmann@Oracle.COM>
Date: Thu, 20 Jan 2011 13:38:53 +0100
Subject: vcl118: #i116501# additional needed fixes for gbuild migration

---
 Repository.mk                   | 4 ++++
 solenv/gbuild/platform/linux.mk | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Repository.mk b/Repository.mk
index bc5ef65f88c4..c78c7205f171 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -38,6 +38,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     sspretty \
 ))
 
+$(eval $(call gb_Helper_register_executables,OOO, \
+    spadmin.bin \
+))
+
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     avmedia \
     basegfx \
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index f8505ccd39fd..71ebb8a2b2c6 100755
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -309,7 +309,7 @@ gb_Executable_LAYER := \
 
 
 define gb_Executable_get_rpath
--Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Library_get_layer,$(1))) \
+-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1))) \
 -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
 endef
 
-- 
cgit