Merge pull request #1275 from ranma42/fix-lib64
authorZoltan Varga <vargaz@gmail.com>
Fri, 12 Sep 2014 00:57:48 +0000 (20:57 -0400)
committerZoltan Varga <vargaz@gmail.com>
Fri, 12 Sep 2014 00:57:48 +0000 (20:57 -0400)
Fix build with lib64 folder for arch-specific libraries

1  2 
data/config.in
runtime/Makefile.am

diff --cc data/config.in
Simple merge
index 2d9c2886dbccf2adea07be5586c47375c626238a,df404acf39808872e299a1007a9d69746f0c4291..ca34a6f396f0db1dd392fecf9cf684482ce7da65
@@@ -168,9 -168,9 +168,9 @@@ CLEANFILES = etc/mono/confi
  # 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; \
 +        sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@t > $@tt; \
          mv -f $@tt $@t; fi
        mv -f $@t $@