* Makefile: Install mcs.exe.config file together with mcs.exe.

	* mcs.exe.config: Added supportedRuntime entry to make sure it runs in the
	correct runtime version.

svn path=/trunk/mcs/; revision=31585

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index ea052d3a6dfd855518cb666f0b641ec8fd195a5d..d440662ead6503535b8ed090a652ca5579c742c2 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-28  Lluis Sanchez Gual  <lluis@novell.com>
+
+       * Makefile: Install mcs.exe.config file together with mcs.exe.
+       * mcs.exe.config: Added supportedRuntime entry to make sure it runs in the
+       correct runtime version.
+       
 2004-07-25  Martin Baulig  <martin@ximian.com>
 
        Merged latest changes into gmcs.  Please keep this comment in

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index e885bd69a241f0833046fb4c10008760d3829018..17818572f17033ef89a6c00b2b94f24e5d76a113 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -17,6 +17,11 @@ PROGRAM = mcs.exe
 PROGRAM_COMPILE = $(BOOT_COMPILE)
 PROGRAM_INSTALL_DIR = $(prefix)/lib/mono/1.0
 
+install-local: mcs.exe
+       $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib/mono/1.0
+       $(INSTALL_BIN) mcs.exe $(DESTDIR)$(prefix)/lib/mono/1.0
+       $(INSTALL_DATA) mcs.exe.config $(DESTDIR)$(prefix)/lib/mono/1.0
+
 CLEAN_FILES = y.output
 
 cs-parser.cs: cs-parser.jay $(topdir)/jay/skeleton.cs

diff --git a/mcs/mcs/mcs.exe.config b/mcs/mcs/mcs.exe.config
index cf61d4baa0b40b06fc9b558bef253755129b8361..922daaf05fd17fb7f8501a323d799f0aa8535f8a 100644 (file)
--- a/mcs/mcs/mcs.exe.config
+++ b/mcs/mcs/mcs.exe.config
@@ -1,4 +1,7 @@
 <configuration>\r
+       <startup>\r
+               <supportedRuntime version="v1.1.4322"/>\r
+       </startup>\r
   <system.diagnostics>\r
     <trace autoflush="true" indentsize="4">\r
       <listeners>\r