summaryrefslogtreecommitdiff
path: root/solenv/gbuild/Pagein.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-28 11:48:22 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-28 11:57:28 +0100
commit45ca1bfc22f5d6857aeefc1e444f369cf6519805 (patch)
tree47b0ca41002ac8adbb00f2a7d8bff916c0466c06 /solenv/gbuild/Pagein.mk
parenteef94c1655605ce890f182e31f3cc64ee3748625 (diff)
Fold URE: Linux ure/lib/* -> program/
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
Diffstat (limited to 'solenv/gbuild/Pagein.mk')
-rw-r--r--solenv/gbuild/Pagein.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 2c20e2920a40..ee133cb85b06 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -7,13 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-gb_Pagein_UREPATH := ../ure-link/lib/
-
gb_Pagein__is_library = $(filter $(1),$(gb_Library_KNOWNLIBS))
-gb_Pagein__get_libdir = $(if $(filter URELIB,$(call gb_Library_get_layer,$(1))),$(call gb_Pagein_UREPATH))
-
-gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Library_get_runtime_filename,$(1))
+gb_Pagein__make_library_path = $(call gb_Library_get_runtime_filename,$(1))
gb_Pagein__make_path = \
$(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))