| 1 |
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
|
| 2 |
===================================================================
|
| 3 |
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
|
| 4 |
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
|
| 5 |
@@ -2,7 +2,7 @@ include defs.mk
|
| 6 |
|
| 7 |
LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
|
| 8 |
HTARGET = $(prefix)/include/$(LIBNAME)/
|
| 9 |
-LIBTARGET = $(prefix)/lib/
|
| 10 |
+LIBTARGET = $(libdir)
|
| 11 |
|
| 12 |
CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
|
| 13 |
|
| 14 |
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200
|
| 15 |
+++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200
|
| 16 |
@@ -521,7 +521,7 @@
|
| 17 |
}
|
| 18 |
|
| 19 |
config = g_build_filename (base, "etc", NULL);
|
| 20 |
- lib = g_build_filename (base, "lib", NULL);
|
| 21 |
+ lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
|
| 22 |
mono = g_build_filename (lib, "mono/1.0", NULL);
|
| 23 |
if (stat (mono, &buf) == -1)
|
| 24 |
fallback ();
|
| 25 |
@@ -1844,7 +1844,7 @@
|
| 26 |
if (extra_gac_paths) {
|
| 27 |
paths = extra_gac_paths;
|
| 28 |
while (!res && *paths) {
|
| 29 |
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
|
| 30 |
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
|
| 31 |
res = probe_for_partial_name (gacpath, fullname, aname, status);
|
| 32 |
g_free (gacpath);
|
| 33 |
paths++;
|
| 34 |
@@ -1908,7 +1908,7 @@
|
| 35 |
paths = extra_gac_paths;
|
| 36 |
while (!image && *paths) {
|
| 37 |
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
|
| 38 |
- "lib", "mono", "gac", subpath, NULL);
|
| 39 |
+ MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
|
| 40 |
image = mono_image_open (fullpath, NULL);
|
| 41 |
g_free (fullpath);
|
| 42 |
paths++;
|
| 43 |
@@ -2058,7 +2058,7 @@
|
| 44 |
if (extra_gac_paths) {
|
| 45 |
paths = extra_gac_paths;
|
| 46 |
while (!result && *paths) {
|
| 47 |
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
|
| 48 |
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
|
| 49 |
result = mono_assembly_open_full (fullpath, status, refonly);
|
| 50 |
g_free (fullpath);
|
| 51 |
paths++;
|
| 52 |
--- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir 2006-08-17 15:40:14.000000000 +0200
|
| 53 |
+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs 2006-08-17 15:40:19.000000000 +0200
|
| 54 |
@@ -667,7 +667,7 @@
|
| 55 |
private static string EnsureLib (string dir)
|
| 56 |
{
|
| 57 |
DirectoryInfo d = new DirectoryInfo (dir);
|
| 58 |
- if (d.Name == "lib")
|
| 59 |
+ if (d.Name == "lib" || d.Name == "lib64")
|
| 60 |
return dir;
|
| 61 |
return Path.Combine (dir, "lib");
|
| 62 |
}
|
Parent Directory
| 
Revision Log