diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-04-25 17:43:06 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-04-25 17:43:06 +0400 |
| commit | 7fdb965fb816e78911310c0aaa283c2ce45a060f (patch) | |
| tree | 0e9a9337a8a06630c3e7ab4cf5b3e83b48ba76c2 /runtime | |
| parent | 5319634c9b355ca01ee9baa276b29b211335e820 (diff) | |
Fix #74692.
* configure.in ($mcsdir/build/config.make): Point RUNTIME and
ILDISASM to the in-tree versions of mono and monodis. Propagate
value of INSTALL to mcs too.
* runtime/Makefile.am: Avoid passing RUNTIME and ILDISASM to each
sub-make, now that 'configure' sets up the 'mcs' tree.
svn path=/trunk/mono/; revision=43546
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 8dc57d64105..fdc9ff98f2f 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -22,7 +22,7 @@ SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config # The write check is to foil 'make distcheck' all-local: $(SUPPORT_FILES) if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' all-profiles + d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles if INSTALL_2_0 build_profiles = default net_2_0 @@ -36,8 +36,7 @@ install: install-exec install-data # override automake install-exec: $(SUPPORT_FILES) d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles # override automake install-data: @@ -46,8 +45,7 @@ install-data: # override automake uninstall: d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles clean-local: d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles @@ -67,11 +65,11 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' test-profiles + d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ + ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ rm -fr $(tmpinst); $$ret if PLATFORM_WIN32 |