|
 |
3fb1a0d |
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
|
|
|
3fb1a0d |
===================================================================
|
|
|
3fb1a0d |
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
|
|
|
3fb1a0d |
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
|
|
|
3fb1a0d |
@@ -2,7 +2,7 @@ include defs.mk
|
|
|
3fb1a0d |
|
|
|
3fb1a0d |
LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
|
|
|
3fb1a0d |
HTARGET = $(prefix)/include/$(LIBNAME)/
|
|
|
3fb1a0d |
-LIBTARGET = $(prefix)/lib/
|
|
|
3fb1a0d |
+LIBTARGET = $(libdir)
|
|
|
3fb1a0d |
|
|
|
3fb1a0d |
CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
|
|
|
3fb1a0d |
|
|
|
3fb1a0d |
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200
|
|
|
3fb1a0d |
+++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200
|
|
|
3fb1a0d |
@@ -521,7 +521,7 @@
|
|
|
3fb1a0d |
}
|
|
|
3fb1a0d |
|
|
|
3fb1a0d |
config = g_build_filename (base, "etc", NULL);
|
|
|
3fb1a0d |
- lib = g_build_filename (base, "lib", NULL);
|
|
|
3fb1a0d |
+ lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
|
|
|
3fb1a0d |
mono = g_build_filename (lib, "mono/1.0", NULL);
|
|
|
3fb1a0d |
if (stat (mono, &buf) == -1)
|
|
|
3fb1a0d |
fallback ();
|
|
|
3fb1a0d |
@@ -1844,7 +1844,7 @@
|
|
|
3fb1a0d |
if (extra_gac_paths) {
|
|
|
3fb1a0d |
paths = extra_gac_paths;
|
|
|
3fb1a0d |
while (!res && *paths) {
|
|
|
3fb1a0d |
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
|
|
|
3fb1a0d |
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
|
|
|
3fb1a0d |
res = probe_for_partial_name (gacpath, fullname, aname, status);
|
|
|
3fb1a0d |
g_free (gacpath);
|
|
|
3fb1a0d |
paths++;
|
|
|
3fb1a0d |
@@ -1908,7 +1908,7 @@
|
|
|
3fb1a0d |
paths = extra_gac_paths;
|
|
|
3fb1a0d |
while (!image && *paths) {
|
|
|
3fb1a0d |
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
|
|
|
3fb1a0d |
- "lib", "mono", "gac", subpath, NULL);
|
|
|
3fb1a0d |
+ MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
|
|
|
3fb1a0d |
image = mono_image_open (fullpath, NULL);
|
|
|
3fb1a0d |
g_free (fullpath);
|
|
|
3fb1a0d |
paths++;
|
|
|
3fb1a0d |
@@ -2058,7 +2058,7 @@
|
|
|
3fb1a0d |
if (extra_gac_paths) {
|
|
|
3fb1a0d |
paths = extra_gac_paths;
|
|
|
3fb1a0d |
while (!result && *paths) {
|
|
|
3fb1a0d |
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
|
|
|
3fb1a0d |
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
|
|
|
3fb1a0d |
result = mono_assembly_open_full (fullpath, status, refonly);
|
|
|
3fb1a0d |
g_free (fullpath);
|
|
|
3fb1a0d |
paths++;
|
|
|
3fb1a0d |
--- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir 2006-08-17 15:40:14.000000000 +0200
|
|
|
3fb1a0d |
+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs 2006-08-17 15:40:19.000000000 +0200
|
|
|
3fb1a0d |
@@ -667,7 +667,7 @@
|
|
|
3fb1a0d |
private static string EnsureLib (string dir)
|
|
|
3fb1a0d |
{
|
|
|
3fb1a0d |
DirectoryInfo d = new DirectoryInfo (dir);
|
|
|
3fb1a0d |
- if (d.Name == "lib")
|
|
|
3fb1a0d |
+ if (d.Name == "lib" || d.Name == "lib64")
|
|
|
3fb1a0d |
return dir;
|
|
|
3fb1a0d |
return Path.Combine (dir, "lib");
|
|
|
3fb1a0d |
}
|