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 b182e0903fd..c1ec9b1f41c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-03-15 Marek Habersack <grendello@gmail.com> + + * runtime/Makefile.am: add browscap.ini to symlinks + + * configure.in: make sure browscap.ini is symlinked to from + runtime/etc/ so that no web tests that depend on the file's + presence fail. + 2007-03-15 Jonathan Chambers <joncham@gmail.com> * winconfig.h: Don't use MONO_XEN_OPT on windows. diff --git a/configure.in b/configure.in index 36163e82dda..96257c4bc40 100644 --- a/configure.in +++ b/configure.in @@ -2010,6 +2010,20 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini], +[ 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 browscap.ini + $LN_S $reldir/data/browscap.ini browscap.ini + cd $depth +],[LN_S='$LN_S']) + AC_OUTPUT([ Makefile mint.pc diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 8a2fd655088..62f25742be2 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -6,11 +6,12 @@ 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/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini 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 +etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini $(symlinks): cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |