diff options
| -rw-r--r-- | mcs/build/config-default.make | 2 | ||||
| -rw-r--r-- | mcs/build/executable.make | 2 | ||||
| -rw-r--r-- | mcs/build/library.make | 8 | ||||
| -rw-r--r-- | mcs/class/corlib/Makefile | 2 | ||||
| -rw-r--r-- | mcs/tools/corcompare/Makefile | 2 | ||||
| -rw-r--r-- | mcs/tools/security/Makefile | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/mcs/build/config-default.make b/mcs/build/config-default.make index 8f091eccf11..da6f0b3780e 100644 --- a/mcs/build/config-default.make +++ b/mcs/build/config-default.make @@ -15,7 +15,7 @@ CFLAGS = -g -O2 INSTALL = /usr/bin/install prefix = /usr/local exec_prefix = $(prefix) -libdir = $(exec_prefix)/lib +mono_libdir = $(exec_prefix)/lib RUNTIME = mono $(RUNTIME_FLAGS) TEST_RUNTIME = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 1b332d14679..ccbbcc3b169 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -35,7 +35,7 @@ install-local uninstall-local: else ifndef PROGRAM_INSTALL_DIR -PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION) +PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) endif install-local: $(PROGRAM) $(PROGRAM_config) diff --git a/mcs/build/library.make b/mcs/build/library.make index 919c90f4bce..8b72293304e 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -92,12 +92,12 @@ SNFLAGS = -q -R endif ifeq ($(PLATFORM), win32) -GACDIR = `cygpath -w $(libdir)` -GACROOT = `cygpath -w $(DESTDIR)$(libdir)` +GACDIR = `cygpath -w $(mono_libdir)` +GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)` test_flags += -d:WINDOWS else -GACDIR = $(libdir) -GACROOT = $(DESTDIR)$(libdir) +GACDIR = $(mono_libdir) +GACROOT = $(DESTDIR)$(mono_libdir) endif all-local: $(the_lib) diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 17276aa6dcb..d170132eba2 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -19,7 +19,7 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes # disable, until people fix their code... #corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB -LIBRARY_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION) +LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) CLEAN_FILES = $(cmplib) $(reslib) $(plattestlib) $(plattestlib).sources \ $(cmp_response) $(cmp_makefrag) \ diff --git a/mcs/tools/corcompare/Makefile b/mcs/tools/corcompare/Makefile index 6f7846b2274..889779bfed6 100644 --- a/mcs/tools/corcompare/Makefile +++ b/mcs/tools/corcompare/Makefile @@ -21,7 +21,7 @@ CORCOMPARE_SOURCES = \ MissingType.cs \ ToDoAssembly.cs -PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION) +PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) APIINFO_SOURCES = mono-api-info.cs APIDIFF_SOURCES = mono-api-diff.cs diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile index 80c5f22515c..d5d264f1db8 100644 --- a/mcs/tools/security/Makefile +++ b/mcs/tools/security/Makefile @@ -8,7 +8,7 @@ LOCAL_MCS_FLAGS = /lib:$(topdir)/class/lib/$(PROFILE) /r:Mono.Security.dll SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe SECURITY_SOURCES = AssemblyInfo.cs StrongNameManager.cs $(SECURITY_PROGRAMS:.exe=.cs) -PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION) +PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) DISTFILES = README $(SECURITY_SOURCES) |