Add --with-icu=yes/no

Add --with-preview=yes/no
Install mcs/mbas into $prefix/lib/mono/1.1
Install gmcs into $prefix/lib/mono/2.0

This is in preparation for the dual installation of libraries GAC + devel.

svn path=/trunk/mono/; revision=26599

3 files changed, 19 insertions, 11 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 3afe86a6e0e..204b044f122 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -7,8 +7,6 @@ SUBDIRS = . net_1_1 net_2_0
 mcs_topdir=$(top_srcdir)/../mcs
 
 monobins_DATA = \
-	mcs.exe 				\
-	mbas.exe				\
 	monoresgen.exe				\
 	secutil.exe				\
 	ilasm.exe				\
@@ -28,10 +26,16 @@ monobins_DATA = \
 	certmgr.exe				\
 	MakeCert.exe				\
 	gacutil.exe				\
-	gmcs.exe				\
 	sn.exe
 
-EXTRA_DIST= $(monobins_DATA)
+fx11_DATA = \
+	mcs.exe					\
+	mbas.exe
+
+fx20_DATA = \
+	gmcs.exe
+
+EXTRA_DIST= $(monobins_DATA) $(fx11_DATA) $(fx20_DATA)
 
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
@@ -40,8 +44,12 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 #
 if PLATFORM_WIN32
 monobinsdir = $(libdir)
+fx11dir = $(libdir)
+fx20dir = $(libdir)
 else
 monobinsdir = $(bindir)
+fx11dir = $(libdir)/mono/1.1/
+fx20dir = $(libdir)/mono/2.0/
 endif
 
 $(monobins_DATA):
diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index 69bb15be64f..9603d121961 100644
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -5,8 +5,6 @@
 mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
-PROFILE=default
-
 if JIT_SUPPORTED
 mono_runtime = $(top_builddir)/mono/mini/mono
 else
@@ -79,7 +77,7 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 assembliesdir = $(libdir)
 
 mscorlib.dll $(gac_assemblies):
-	cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir)
+	cp -f $(mcs_topdir)/class/lib/default/$@ $(srcdir)
 
 all-local: $(gac_assemblies)
 
diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am
index 303e044dd0d..91a49e05690 100644
--- a/runtime/net_2_0/Makefile.am
+++ b/runtime/net_2_0/Makefile.am
@@ -5,8 +5,6 @@
 mcs_topdir=$(top_srcdir)/../mcs
 gacutil=$(srcdir)/../gacutil.exe
 
-PROFILE=net_2_0
-
 if JIT_SUPPORTED
 mono_runtime = $(top_builddir)/mono/mini/mono
 else
@@ -64,9 +62,13 @@ gac_assemblies_list = \
 	System.Windows.Forms				\
 	System.Xml
 
+if INSTALL_2_0
 gac_assemblies = $(gac_assemblies_list:=.dll)
+else
+gac_assemblies = 
+endif
 
-corlibdir = $(libdir)/net_2_0
+corlibdir = $(libdir)/mono/2.0
 corlib_DATA = mscorlib.dll
 
 EXTRA_DIST = $(gac_assemblies) $(corlib_DATA)
@@ -78,7 +80,7 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST)
 assembliesdir = $(libdir)
 
 mscorlib.dll $(gac_assemblies):
-	cp -f $(mcs_topdir)/class/lib/$(PROFILE)/$@ $(srcdir)
+	cp -f $(mcs_topdir)/class/lib/net_2_0/$@ $(srcdir)
 
 all-local: $(gac_assemblies)