diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | runtime/Makefile.am | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 217bdaa4d71..2bb8bcc059a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-09-13 Jonathan Pryor <jonpryor@vt.edu> + + * configure.in: Add command to create runtime/etc/mono/config. This is + needed so that programs which use the bootstrap mono build get the + appropriate <dllmap/> entries (in particular, the mono-shlib-cop unit + tests requires that a $prefix/etc/mono/config be present to run). + * runtime/Makefile.am: Create runtime/etc/mono/config. + 2006-09-11 Zoltan Varga <vargaz@gmail.com> * mono.vcproj: Fix VC build. diff --git a/configure.in b/configure.in index b2465ef2bd6..734650e65ba 100644 --- a/configure.in +++ b/configure.in @@ -1857,6 +1857,20 @@ 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 4610d47a4b2..21de2a95960 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -6,8 +6,9 @@ tmpinst = _tmpinst noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper etctmp = etc -symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config +symlinks = etc/mono/config 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 |