diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-05-04 11:38:05 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-05-04 11:38:05 +0400 |
| commit | 465c6f4ab4cfc17d0aa89b324d706ab7a6f8642c (patch) | |
| tree | a14cb4b0a1470ee87570287920937c849d32bec4 /runtime | |
| parent | d3ad603cedf6d7a42c92e59f4e3e9c48214aef8e (diff) | |
* runtime/net_1_1/Makefile.am (mono_runtime): Use USE_JIT, not
JIT_SUPPORTED.
(install-data-local, uninstall-data-local): Run runtime with
libtool.
* runtime/net_2_0/Makefile.am: Likewise.
Report from Urs C Muff <umuff@quark.com>.
svn path=/trunk/mono/; revision=26685
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 9 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index d666cd524e8..ddf574113a3 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -5,7 +5,7 @@ mcs_topdir=$(top_srcdir)/../mcs gacutil=$(srcdir)/../gacutil.exe -if JIT_SUPPORTED +if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono else mono_runtime = $(top_builddir)/mono/interpreter/mint @@ -68,7 +68,6 @@ corlibdir = $(libdir) corlib_DATA = mscorlib.dll EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) - MAINTAINERCLEANFILES = $(EXTRA_DIST) # @@ -86,15 +85,15 @@ install-data-local: for i in ''$(gac_assemblies); do \ echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir) \ - $(mono_runtime) --config ../../data/config $(gacutil) -i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir) || exit 1 ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) -i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir) || exit 1 ; \ done; fi uninstall-local: @if test -n '$(gac_assemblies_list)'; then \ for i in ''$(gac_assemblies_list); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i" ; \ + echo "MONO_PATH=$(srcdir) $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir) \ - $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir) || true; \ + $(LIBTOOL) --mode=execute $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir) || true ; \ done; fi copy_dlls: diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index 486f19925a4..7d1be28cd26 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -5,7 +5,7 @@ mcs_topdir=$(top_srcdir)/../mcs gacutil=$(srcdir)/../gacutil.exe -if JIT_SUPPORTED +if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono else mono_runtime = $(top_builddir)/mono/interpreter/mint @@ -89,15 +89,15 @@ install-data-local: for i in ''$(gac_assemblies); do \ echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) -i $(srcdir)/$$i /f /package 2.0 /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir)/../net_1_1 \ - $(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 2.0 /root $(DESTDIR)$(libdir) || exit 1 ; \ done; fi uninstall-local: @if test -n '$(gac_assemblies_list)'; then \ for i in ''$(gac_assemblies_list); do \ - echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) /u $$i" ; \ + echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir)/../net_1_1 \ - $(mono_runtime) $(gacutil) /u $$i || true ; \ + $(LIBTOOL) --mode=execute $(mono_runtime) $(gacutil) /u $$i /root $(DESTDIR)$(libdir) || true ; \ done; fi copy_dlls: |