diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | runtime/Makefile.am | 14 | ||||
| -rw-r--r-- | runtime/mono-wrapper.in | 2 |
4 files changed, 15 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 341d5979ea5..50933d6cfa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-16 Raja R Harinath <rharinath@novell.com> + + 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. + 2006-09-15 Jonathan Pryor <jonpryor@vt.edu> * configure.in: Remove check for setkey(3). diff --git a/configure.in b/configure.in index 0ca236712bd..64a6e92ac8c 100644 --- a/configure.in +++ b/configure.in @@ -1850,20 +1850,6 @@ AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper]) AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper]) -AC_CONFIG_COMMANDS([runtime/etc/mono/config], -[ depth=../../.. - case $srcdir in - [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; - .) reldir=$depth ;; - *) reldir=$depth/$srcdir ;; - esac - $ac_aux_dir/install-sh -d runtime/etc/mono - cd runtime/etc/mono - rm -f config - $LN_S $reldir/data/config config - cd $depth -],[LN_S='$LN_S']) - AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config], [ depth=../../../.. case $srcdir in 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" "$@" |