Do not hardcode lib path

The changes from 3408b8e5f194774e529e223173d68a1a8f880ea5 cause
regressions in distros which do not use lib as folder for
arch-specific libraries, like Fedora x86_64.

Instead, reloc_libdir should be used (as in data/mono.pc.in).

This change is released under the MIT/X11 license.

diff --git a/data/config.in b/data/config.in
index fc764c7a02943f75a25fe94dad4950eabd58ae79..c337f82f17f698480c6c39be8654a621d7044f36 100644 (file)
--- a/data/config.in
+++ b/data/config.in
@@ -10,7 +10,7 @@
        <dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
        <dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
        <dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
-       <dllmap dll="MonoPosixHelper" target="@prefix@/lib/libMonoPosixHelper@libsuffix@" os="!windows" />
+       <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
        <dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
        <dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
        <dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 7c9b6006673d0c11190037859c7cf967e41e1a78..df404acf39808872e299a1007a9d69746f0c4291 100644 (file)
--- 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="$(prefix)/lib/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
+       sed 's,target="$(prefix)/$(reloc_libdir)/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