diff options
| author | Lluis Sanchez <lluis@novell.com> | 2004-07-28 23:19:10 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2004-07-28 23:19:10 +0400 |
| commit | 40fac876a0812c2d214638f75aaf048468ea813f (patch) | |
| tree | ffe92be1c11b9eab17b162150122ab78dd3b60be /runtime | |
| parent | 281e1c0acea9982a20dca10c23051359450f2da7 (diff) | |
runtime/net_1_1/Makefile.am, runtime/net_2_0/Makefile.am: Install mscorlib
at the correct version specific directory.
svn path=/trunk/mono/; revision=31581
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 7 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 6f717c5256a..b1cf126c1cc 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -3,6 +3,7 @@ # gacutil=$(srcdir)/../gacutil.exe +framework_version = 1.0 if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono @@ -74,7 +75,7 @@ gac_assemblies_list = \ gac_assemblies = $(gac_assemblies_list:=.dll) -corlibdir = $(libdir) +corlibdir = $(libdir)/mono/$(framework_version) corlib_DATA = mscorlib.dll EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) @@ -90,9 +91,9 @@ all-local: $(gac_assemblies) install-data-local: @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ + echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ done; fi uninstall-local: diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index 449104f9a9c..27dc12c3c42 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -3,6 +3,7 @@ # gacutil=$(srcdir)/../gacutil.exe +framework_version = 2.0 if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono @@ -73,7 +74,7 @@ gac_assemblies = $(gac_assemblies_list:=.dll) local_mscorlib = mscorlib.dll endif -corlibdir = $(libdir)/mono/2.0 +corlibdir = $(libdir)/mono/$(framework_version) corlib_DATA = $(local_mscorlib) EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) @@ -90,9 +91,9 @@ if INSTALL_2_0 install-data-local: @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 2.0 /root $(DESTDIR)$(libdir)" ; \ + echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir)/../net_1_1 \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 2.0 /root $(DESTDIR)$(libdir) || exit 1 ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package $(framework_version) /root $(DESTDIR)$(libdir) || exit 1 ; \ done; fi uninstall-local: |