| 1 |
--- mono-2.6/mono/metadata/Makefile.am 2009-09-25 15:58:10.000000000 +0100
|
| 2 |
+++ mono-2.6/mono/metadata/Makefile-new.am 2009-09-30 19:23:39.000000000 +0100
|
| 3 |
@@ -20,7 +20,7 @@
|
| 4 |
AM_CFLAGS = -O
|
| 5 |
else
|
| 6 |
|
| 7 |
-assembliesdir = $(exec_prefix)/lib
|
| 8 |
+assembliesdir = $(libdir)
|
| 9 |
confdir = $(sysconfdir)
|
| 10 |
unix_sources = \
|
| 11 |
console-unix.c
|
| 12 |
@@ -36,7 +36,7 @@
|
| 13 |
#
|
| 14 |
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
|
| 15 |
|
| 16 |
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
|
| 17 |
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
|
| 18 |
|
| 19 |
#
|
| 20 |
# Make sure any prefix changes are updated in the binaries too.
|
| 21 |
--- mono-2.6/mono/metadata/Makefile.in 2009-09-30 17:34:17.000000000 +0100
|
| 22 |
+++ mono-2.6/mono/metadata/Makefile-new.in 2009-09-30 19:27:02.000000000 +0100
|
| 23 |
@@ -372,7 +372,7 @@
|
| 24 |
# The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
|
| 25 |
# / by \ if running under WIN32.
|
| 26 |
@CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE@assembliesdir = ${libdir}
|
| 27 |
-@PLATFORM_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
|
| 28 |
+@PLATFORM_WIN32_FALSE@assembliesdir = $(libdir)
|
| 29 |
@CROSS_COMPILING_FALSE@@PLATFORM_WIN32_TRUE@confdir = `cygpath -m "${sysconfdir}"`
|
| 30 |
@CROSS_COMPILING_TRUE@@PLATFORM_WIN32_TRUE@confdir = ${sysconfdir}
|
| 31 |
@PLATFORM_WIN32_FALSE@confdir = $(sysconfdir)
|
| 32 |
@@ -388,7 +388,7 @@
|
| 33 |
# convenience lib, so we have to do it ourselves
|
| 34 |
#
|
| 35 |
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la
|
| 36 |
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
|
| 37 |
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
|
| 38 |
CLEANFILES = mono-bundle.stamp
|
| 39 |
libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
|
| 40 |
null_sources = \
|