diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2006-09-16 13:34:03 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2006-09-16 13:34:03 +0400 |
| commit | ee5ea42aae99094d90b34cf51f9d1c8225af7a22 (patch) | |
| tree | 1bcffb0542ea0d39d073cc3e74dd0bb5aecd6d7c /runtime | |
| parent | 51d1b8c6a5601bbc2f38a9c1c916f54f7f4523b4 (diff) | |
Fix srcdir!=builddir issue.
* configure.in (runtime/etc/mono/config): Remove erroneous code.
* runtime/Makefile.am (etc/mono/config): Rename from wrapper-config.
* runtime/mono-wrapper.in: Update.
svn path=/trunk/mono/; revision=65502
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 14 | ||||
| -rw-r--r-- | runtime/mono-wrapper.in | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 21de2a95960..c0426d2495e 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -6,9 +6,8 @@ tmpinst = _tmpinst noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper etctmp = etc -symlinks = etc/mono/config etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config +symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config -etc/mono/config : $(top_srcdir)/data/config etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config @@ -16,7 +15,7 @@ etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config $(symlinks): cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config +SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config if INSTALL_2_0 build_profiles = default net_2_0 @@ -83,7 +82,7 @@ PLATFORM_PATH_SEPARATOR = : endif # Use --compile-all as a poor man's PEVerify to detect invalid IL -mcs-compileall: mono-wrapper wrapper-config +mcs-compileall: mono-wrapper etc/mono/config save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \ for profile in $(build_profiles); do \ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \ @@ -98,9 +97,10 @@ mcs-compileall: mono-wrapper wrapper-config check-local: mcs-compileall mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles -CLEANFILES = wrapper-config +CLEANFILES = etc/mono/config -wrapper-config: ../data/config Makefile +# depend on $(symlinks) to ensure 'etc/mono' directory exists +etc/mono/config: ../data/config Makefile $(symlinks) d=`cd ../support && pwd`; \ sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@ if test -z "$(libgdiplus_loc)"; then :; else \ @@ -109,7 +109,7 @@ wrapper-config: ../data/config Makefile rm -f $@t; \ fi -$(tmpinst)/bin/mono: mono-wrapper wrapper-config +$(tmpinst)/bin/mono: mono-wrapper etc/mono/config cp mono-wrapper $@ $(tmpinst)/bin/mcs: diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in index 4ea240ef335..bed9aa12f8b 100644 --- a/runtime/mono-wrapper.in +++ b/runtime/mono-wrapper.in @@ -3,4 +3,4 @@ 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/runtime/wrapper-config" "$@" +exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@" |