From 3408b8e5f194774e529e223173d68a1a8f880ea5 Mon Sep 17 00:00:00 2001 From: Andrea Canciani Date: Tue, 27 May 2014 12:57:38 +0200 Subject: [PATCH] Use Mono prefix for libMonoPosixHelper MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The libMonoPosixHelper is installed together with Mono, hence its path in the configuration should be relative to the Mono prefix. It was previously assumed to reside in a system path, so the the dynamic linker would find it anyway. This patch is based on the one included in bug #18555 (by Gaëtan Lehmann ), but it also updates runtime/Makefile.am to keep runtime/etc/mono/config consistent. Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=18555 --- data/config.in | 2 +- runtime/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/config.in b/data/config.in index 3cc39732e1c..fc764c7a029 100644 --- a/data/config.in +++ b/data/config.in @@ -10,7 +10,7 @@ - + diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 6b784a3d6e8..7c9b6006673 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -168,7 +168,7 @@ CLEANFILES = etc/mono/config # depend on $(symlinks) to ensure 'etc/mono' directory exists etc/mono/config: ../data/config Makefile $(symlinks) d=`cd ../support && pwd`; \ - sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t + sed 's,target="$(prefix)/lib/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t if test -z "$(libgdiplus_loc)"; then :; else \ sed 's,target="[^"]*libgdiplus[^"]*",target="$(libgdiplus_loc)",' $@t > $@tt; \ mv -f $@tt $@t; fi -- 2.25.1