diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2004-12-14 13:55:56 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2004-12-14 13:55:56 +0300 |
| commit | 35d06b6dd712de83c2abfe1c2079519e27228fb4 (patch) | |
| tree | 3a08fc0a5ab5b03fd987c4f80ecd247463b413eb /runtime | |
| parent | aa1a187f5763682568acb76f7f04c922c65341fe (diff) | |
* runtime/mono-wrapper.in (MONO_SHARED_DIR): Set. Ensures that
state isn't shared between an installed runtime and the in-tree
runtime, and also ensure that both 'make check' and 'make
distcheck' can run in parallel.
* runtime/Makefile.am (clean-local): Remove the .wapi directory.
svn path=/trunk/mono/; revision=37736
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 3 | ||||
| -rw-r--r-- | runtime/mono-wrapper.in | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 7f40f0e180c..38301be6846 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -50,9 +50,8 @@ uninstall: RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles clean-local: - -rm -fr $(symlinks) d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(clean_profiles)' clean-profiles - -rm -fr $(tmpinst) + -rm -fr $(symlinks) $(tmpinst) .wapi if INSTALL_2_0 TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in index e00f38dcf97..a03fa731024 100644 --- a/runtime/mono-wrapper.in +++ b/runtime/mono-wrapper.in @@ -1,4 +1,6 @@ #! /bin/sh -MONO_CFG_DIR='@mono_cfg_dir@'; export MONO_CFG_DIR -r=@mono_build_root@ +r='@mono_build_root@' +MONO_CFG_DIR='@mono_cfg_dir@' +MONO_SHARED_DIR=$r/runtime +export MONO_CFG_DIR MONO_SHARED_DIR exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "$r/data/config" "$@" |