diff options
-rw-r--r-- | configure.in | 32 | ||||
-rw-r--r-- | data/Browsers/.gitattributes (renamed from data/net_2_0/Browsers/.gitattributes) | 0 | ||||
-rw-r--r-- | data/Browsers/ChangeLog (renamed from data/net_2_0/Browsers/ChangeLog) | 0 | ||||
-rw-r--r-- | data/Browsers/Compat.browser (renamed from data/net_2_0/Browsers/Compat.browser) | 0 | ||||
-rw-r--r-- | data/net_2_0/Browsers/Makefile.am | 4 | ||||
-rw-r--r-- | data/net_4_0/Browsers/.gitignore | 2 | ||||
-rw-r--r-- | data/net_4_0/Browsers/Makefile.am | 6 | ||||
-rw-r--r-- | data/net_4_0/Makefile.am | 2 | ||||
-rw-r--r-- | data/net_4_5/Browsers/.gitignore | 2 | ||||
-rw-r--r-- | data/net_4_5/Browsers/Makefile.am | 6 | ||||
-rw-r--r-- | data/net_4_5/Makefile.am | 2 | ||||
-rw-r--r-- | mono-core.spec.in | 2 | ||||
-rw-r--r-- | msvc/win32.xml | 6 | ||||
-rw-r--r-- | runtime/Makefile.am | 6 |
14 files changed, 61 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 012fbc7f914..c806492e281 100644 --- a/configure.in +++ b/configure.in @@ -3388,7 +3388,35 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser], $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/ cd runtime/etc/mono/2.0/Browsers rm -f Compat.browser - $LN_S $reldir/data/net_2_0/Browsers/Compat.browser Compat.browser + $LN_S $reldir/data/Browsers/Compat.browser Compat.browser + cd $depth +],[LN_S='$LN_S']) + +AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/Browsers/Compat.browser], +[ depth=../../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.0/Browsers/ + cd runtime/etc/mono/4.0/Browsers + rm -f Compat.browser + $LN_S $reldir/data/Browsers/Compat.browser Compat.browser + cd $depth +],[LN_S='$LN_S']) + +AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser], +[ depth=../../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/ + cd runtime/etc/mono/4.5/Browsers + rm -f Compat.browser + $LN_S $reldir/data/Browsers/Compat.browser Compat.browser cd $depth ],[LN_S='$LN_S']) @@ -3496,6 +3524,8 @@ data/net_2_0/Makefile data/net_4_0/Makefile data/net_4_5/Makefile data/net_2_0/Browsers/Makefile +data/net_4_0/Browsers/Makefile +data/net_4_5/Browsers/Makefile data/mint.pc data/mono-2.pc data/monosgen-2.pc diff --git a/data/net_2_0/Browsers/.gitattributes b/data/Browsers/.gitattributes index 6b8861b0555..6b8861b0555 100644 --- a/data/net_2_0/Browsers/.gitattributes +++ b/data/Browsers/.gitattributes diff --git a/data/net_2_0/Browsers/ChangeLog b/data/Browsers/ChangeLog index 26785e377c4..26785e377c4 100644 --- a/data/net_2_0/Browsers/ChangeLog +++ b/data/Browsers/ChangeLog diff --git a/data/net_2_0/Browsers/Compat.browser b/data/Browsers/Compat.browser index 9950c71c5f0..9950c71c5f0 100644 --- a/data/net_2_0/Browsers/Compat.browser +++ b/data/Browsers/Compat.browser diff --git a/data/net_2_0/Browsers/Makefile.am b/data/net_2_0/Browsers/Makefile.am index 4d5b8c9c56b..ed00678b164 100644 --- a/data/net_2_0/Browsers/Makefile.am +++ b/data/net_2_0/Browsers/Makefile.am @@ -1,6 +1,6 @@ monodir = $(sysconfdir)/mono/2.0/Browsers -EXTRA_DIST = Compat.browser +EXTRA_DIST = ../../Browsers/Compat.browser -mono_DATA = Compat.browser +mono_DATA = ../../Browsers/Compat.browser diff --git a/data/net_4_0/Browsers/.gitignore b/data/net_4_0/Browsers/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/data/net_4_0/Browsers/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/data/net_4_0/Browsers/Makefile.am b/data/net_4_0/Browsers/Makefile.am new file mode 100644 index 00000000000..0940002cb62 --- /dev/null +++ b/data/net_4_0/Browsers/Makefile.am @@ -0,0 +1,6 @@ +monodir = $(sysconfdir)/mono/4.0/Browsers + +EXTRA_DIST = ../../Browsers/Compat.browser + +mono_DATA = ../../Browsers/Compat.browser + diff --git a/data/net_4_0/Makefile.am b/data/net_4_0/Makefile.am index 9ca4996f8b2..31727c5910b 100644 --- a/data/net_4_0/Makefile.am +++ b/data/net_4_0/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = +SUBDIRS = Browsers monodir = $(sysconfdir)/mono/4.0 diff --git a/data/net_4_5/Browsers/.gitignore b/data/net_4_5/Browsers/.gitignore new file mode 100644 index 00000000000..b336cc7cec9 --- /dev/null +++ b/data/net_4_5/Browsers/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/data/net_4_5/Browsers/Makefile.am b/data/net_4_5/Browsers/Makefile.am new file mode 100644 index 00000000000..a2348293401 --- /dev/null +++ b/data/net_4_5/Browsers/Makefile.am @@ -0,0 +1,6 @@ +monodir = $(sysconfdir)/mono/4.5/Browsers + +EXTRA_DIST = ../../Browsers/Compat.browser + +mono_DATA = ../../Browsers/Compat.browser + diff --git a/data/net_4_5/Makefile.am b/data/net_4_5/Makefile.am index c45989c15e0..bfe4ac6a7b4 100644 --- a/data/net_4_5/Makefile.am +++ b/data/net_4_5/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = +SUBDIRS = Browsers monodir = $(sysconfdir)/mono/4.5 diff --git a/mono-core.spec.in b/mono-core.spec.in index 455e0e5c51d..217bcaa0226 100644 --- a/mono-core.spec.in +++ b/mono-core.spec.in @@ -908,8 +908,10 @@ Mono implementation of ASP.NET, Remoting and Web Services. %config %_sysconfdir/mono/2.0/Browsers %config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx %config %_sysconfdir/mono/2.0/web.config +%config %_sysconfdir/mono/4.0/Browsers %config %_sysconfdir/mono/4.0/DefaultWsdlHelpGenerator.aspx %config %_sysconfdir/mono/4.0/web.config +%config %_sysconfdir/mono/4.5/Browsers %config %_sysconfdir/mono/4.5/DefaultWsdlHelpGenerator.aspx %config %_sysconfdir/mono/4.5/web.config %config %_sysconfdir/mono/browscap.ini diff --git a/msvc/win32.xml b/msvc/win32.xml index 4ab2c674cb4..6263590c110 100644 --- a/msvc/win32.xml +++ b/msvc/win32.xml @@ -17,7 +17,9 @@ <Copy source="{sourcedir}\mono\data\net_2_0\DefaultWsdlHelpGenerator.aspx" destination="{destdir}\etc\mono\2.0\DefaultWsdlHelpGenerator.aspx" />
<Copy source="{sourcedir}\mono\data\net_2_0\settings.map" destination="{destdir}\etc\mono\2.0\settings.map" />
<Copy source="{sourcedir}\mono\data\net_2_0\web.config" destination="{destdir}\etc\mono\2.0\web.config" />
- <Copy source="{sourcedir}\mono\data\net_2_0\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
+ <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\2.0\Browsers\Compat.browser" />
+ <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.0\Browsers\Compat.browser" />
+ <Copy source="{sourcedir}\mono\data\Browsers\Compat.browser" destination="{destdir}\etc\mono\4.5\Browsers\Compat.browser" />
<Copy source="{sourcedir}\mono\data\browscap.ini" destination="{destdir}\etc\mono\browscap.ini" />
<!-- Bring in xulrunner -->
@@ -1894,4 +1896,4 @@ <!-- Build the wix includes files -->
<WixInclude installeronly="true" root="{destdir}" wixfiles="{destdir}\Files.wxi" wixcomponents="{destdir}\Components.wxi"/>
-</Assemblies>
\ No newline at end of file +</Assemblies>
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 92708946825..8cf639ff911 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -6,13 +6,15 @@ etctmp = etc 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/2.0/Browsers/Compat.browser if INSTALL_4_0 -symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config +symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser endif 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 -etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser +etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser +etc/mono/4.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser +etc/mono/4.5/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config |