2008-10-08 Zoltan Varga <vargaz@gmail.com>

	* Makefile */Makefile build/profiles/*.make: Rename the 'default'
	profile to 'net_1_1'.

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

22 files changed, 73 insertions, 39 deletions

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index a0d5d8125b6..92c699a5976 100644
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-08  Zoltan Varga  <vargaz@gmail.com>
+
+	* Makefile */Makefile build/profiles/*.make: Rename the 'default'
+	profile to 'net_1_1'.
+
 2008-05-14  Marek Safar  <marek.safar@gmail.com>
 
 	* Makefile: Enabled more tests.
diff --git a/mcs/Makefile b/mcs/Makefile
index 0680644a150..2bb6adf8276 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -49,7 +49,7 @@ net_2_0_centum_tests := \
 	class/Microsoft.Build.Utilities		\
 	class/Microsoft.Build.Engine		\
 	class/Mono.C5
-	
+
 #	class/System.Web.Extensions
 #	class/Microsoft.Build.Tasks	
 
@@ -78,7 +78,7 @@ dir-check:
 
 # fun specialty targets
 
-PROFILES = default net_2_0 net_3_5
+PROFILES = net_1_1 net_2_0 net_3_5
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -102,8 +102,8 @@ $(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:
 $(_boot_:%=profile-do--net_2_1_raw--%):       profile-do--net_2_1_raw--%:       profile-do--net_2_1_bootstrap--%
 $(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--net_2_0--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
-$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--default--%
-$(_boot_:%=profile-do--default--%):           profile-do--default--%:           profile-do--net_1_1_bootstrap--%
+$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--net_1_1--%
+$(_boot_:%=profile-do--net_1_1--%):           profile-do--net_1_1--%:           profile-do--net_1_1_bootstrap--%
 $(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
 
 testcorlib:
@@ -113,7 +113,7 @@ compiler-tests:
 	$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
 
 test-installed-compiler:
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=default TEST_RUNTIME=mono MCS=mcs run-test
+	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_1_1 TEST_RUNTIME=mono MCS=mcs run-test
 	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_2_0 TEST_RUNTIME=mono MCS=gmcs run-test
 
 package := mcs-$(VERSION)
diff --git a/mcs/build/Makefile b/mcs/build/Makefile
index e475f2b4111..3d2538ec38e 100644
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -18,7 +18,7 @@ PLATFORMS = linux win32
 PROFILES = \
 	basic \
 	net_1_1_bootstrap \
-	default \
+	net_1_1	\
 	net_2_0_bootstrap \
 	net_2_0 \
 	net_2_1_bootstrap \
diff --git a/mcs/build/profiles/net_1_1.make b/mcs/build/profiles/net_1_1.make
new file mode 100644
index 00000000000..31f830d3279
--- /dev/null
+++ b/mcs/build/profiles/net_1_1.make
@@ -0,0 +1,28 @@
+# -*- makefile -*-
+#
+# The default 'bootstrap' profile -- builds so that we link against
+# the libraries as we build them.
+#
+# We use the platform's native C# runtime and compiler if possible.
+
+# Note that we have sort of confusing terminology here; BOOTSTRAP_MCS
+# is what allows us to bootstrap ourselves, but when we are bootstrapping,
+# we use INTERNAL_MCS.
+
+# When bootstrapping, compile against our new assemblies.
+# (MONO_PATH doesn't just affect what assemblies are loaded to
+# run the compiler; /r: flags are by default loaded from whatever's
+# in the MONO_PATH too).
+
+BOOTSTRAP_PROFILE = net_1_1_bootstrap
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
+MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS)
+MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MBAS)
+
+# nuttzing!
+
+profile-check:
+
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
+PROFILE_MBAS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
+FRAMEWORK_VERSION = 1.0
diff --git a/mcs/build/profiles/net_2_0_bootstrap.make b/mcs/build/profiles/net_2_0_bootstrap.make
index 9f267c65cfa..62a99351dd6 100644
--- a/mcs/build/profiles/net_2_0_bootstrap.make
+++ b/mcs/build/profiles/net_2_0_bootstrap.make
@@ -4,7 +4,8 @@
 # Note that we're using the .NET 1.1 MCS but MONO_PATH points to the net_2_0_bootstrap directory.
 # We do it this way to get assembly version references right.
 #
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/default/mcs.exe
+BOOTSTRAP_PROFILE = net_1_1
+BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/gmcs.exe
 
 profile-check: 
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1dd62871a82..a0222f15529 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -89,7 +89,7 @@ common_dirs := \
 	CustomMarshalers		\
 	OpenSystem.C
 
-default_dirs :=		\
+net_1_1_dirs :=		\
 	FirebirdSql.Data.Firebird	\
 	Mono.Cecil			\
 	Mono.Cecil.Mdb		\
@@ -129,7 +129,7 @@ net_2_1_dirs := \
 net_3_5_dirs := \
 	System.Web.Extensions.Design
 
-default_SUBDIRS := $(common_dirs) $(default_dirs)
+net_1_1_SUBDIRS := $(common_dirs) $(net_1_1_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
 net_2_1_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter
 net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
@@ -137,7 +137,7 @@ net_3_5_SUBDIRS := $(net_3_5_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
+SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
 #BROKEN_SUBDIRS =
diff --git a/mcs/class/Mono.Security/Test/tools/sockethell/Makefile b/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
index f4494c3674c..9a3641a4f2a 100644
--- a/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
+++ b/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
@@ -2,14 +2,14 @@ thisdir = class/Mono.Security/Test/tools/sockethell
 SUBDIRS = 
 include ../../../../../build/rules.make
 
-LOCAL_MCS_FLAGS = -r:System.dll -r:Mono.Security.dll -r:../../../../lib/default/nunit.framework.dll
+LOCAL_MCS_FLAGS = -r:System.dll -r:Mono.Security.dll -r:../../../../lib/net_1_1/nunit.framework.dll
 
 all-local install-local uninstall-local:
 
 test-local:
 
 run-test-local: SocketHell.dll
-	mono ../../../../lib/default/nunit-console.exe SocketHell.dll
+	mono ../../../../lib/net_1_1/nunit-console.exe SocketHell.dll
 
 clean-local:
 	rm -f *.dll *.mdb *.pdb TestResult.xml
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile b/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
index 96ccddbc3fc..77f753da153 100644
--- a/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
+++ b/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
@@ -14,4 +14,4 @@ $(DRAWING_TEST_HELPER):
 	cp ../DrawingTestHelper/*.dll .
 
 run-test: Test.dll
-	MONO_PATH="../../../../../class/lib/default::$(MONO_PATH)" /home/andrews/monobuild/mono/runtime/mono-wrapper --debug ../../../../../class/lib/default/nunit-console.exe Test.dll $(NUNIT_FLAGS)
+	MONO_PATH="../../../../../class/lib/net_1_1::$(MONO_PATH)" /home/andrews/monobuild/mono/runtime/mono-wrapper --debug ../../../../../class/lib/net_1_1/nunit-console.exe Test.dll $(NUNIT_FLAGS)
diff --git a/mcs/class/System.EnterpriseServices/Makefile b/mcs/class/System.EnterpriseServices/Makefile
index aa9be7df359..27d35840cc5 100644
--- a/mcs/class/System.EnterpriseServices/Makefile
+++ b/mcs/class/System.EnterpriseServices/Makefile
@@ -6,7 +6,7 @@ LIBRARY = System.EnterpriseServices.dll
 LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib)
 NO_TEST = yes
 
-ifneq (default, $(PROFILE))
+ifneq (net_1_1, $(PROFILE))
 LIB_MCS_FLAGS += /r:System.Transactions.dll
 endif
 
diff --git a/mcs/class/System.Security/Test/standalone_tests/Makefile b/mcs/class/System.Security/Test/standalone_tests/Makefile
index 08719c4ef15..b6259de7ad1 100644
--- a/mcs/class/System.Security/Test/standalone_tests/Makefile
+++ b/mcs/class/System.Security/Test/standalone_tests/Makefile
@@ -1,4 +1,4 @@
-PROFILE = default
+PROFILE = net_1_1
 RUNTIME = MONO_PATH=../../../lib/$(PROFILE) mono --debug 
 #XMLDSIG_EXE_OPTIONS =
 XMLDSIG_EXE_OPTIONS = --decent-reader
diff --git a/mcs/class/System.Web.Services/Test/standalone/Makefile b/mcs/class/System.Web.Services/Test/standalone/Makefile
index 40a8f3bc667..63b5c87579d 100644
--- a/mcs/class/System.Web.Services/Test/standalone/Makefile
+++ b/mcs/class/System.Web.Services/Test/standalone/Makefile
@@ -1,5 +1,5 @@
 MCS=mcs -g
-MONO=MONO_PATH=../../../lib/default mono
+MONO=MONO_PATH=../../../lib/net_1_1 mono
 sourcefile = proxies.sources
 
 tools: wstest.exe
@@ -71,7 +71,7 @@ test-clients: tests
 	rm -f somefile && touch somefile
 	(tail -f somefile | xsp --root server)&
 	sleep 2
-	-harness=../../../lib/default/nunit-console.exe; \
+	-harness=../../../lib/net_1_1/nunit-console.exe; \
 	if test -f $$harness; then :; else harness=../../../lib/nunit-console.exe; fi; \
 	$(MONO) $$harness System.Web.Services-standalone_test.dll
 	echo "" >> somefile
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
index f17b42926cd..5a5f67915dd 100644
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
+++ b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
@@ -13,7 +13,7 @@ ifeq ($(PROFILE), net_2_0)
 	CSCOMPILE=gmcs
 	XSPSERVER=xsp2
 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 	XSPSERVER=xsp
 endif
@@ -23,10 +23,10 @@ TEST_PROG=bin/MainsoftWebApp.dll
 
 $(TEST_PROG) : 
 	$(CSCOMPILE) -target:library -recurse:./*.cs -r:System.Web.dll -r:System.Data.dll -r:System.Drawing.dll -out:$@
-

+
 run-xsp : $(TEST_PROG)
 	$(XSPSERVER) --port 8088 --applications /MainsoftWebApp:./ --nonstop
-	
+
 clean :
 	rm -f $(TEST_PROG)
 
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile b/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
index cd9fdeec903..c1df7c706c2 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
@@ -1,4 +1,4 @@
-PROFILE = default
+PROFILE = net_1_1
 RUNTIME = MONO_PATH=../../../../lib/$(PROFILE) mono --debug
 ifeq ($(PROFILE), net_2_0)
 	MCS = gmcs
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
index fa2aff46501..9930b43817e 100644
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
@@ -16,7 +16,7 @@ ifeq ($(PROFILE), net_2_0)
 	nunit_MONO_PATH="../../../../../class/lib/net_2_0"
 	CSCOMPILE=gmcs
 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 endif
 
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/Makefile b/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
index d325b5a3a83..01047b57ced 100644
--- a/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
@@ -7,7 +7,7 @@ ifeq ($(PROFILE), net_2_0)
 	nunit_MONO_PATH="../../../../../class/lib/net_2_0"
 	CSCOMPILE=gmcs

 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 endif
 
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 62c9510c3e3..12574ad55df 100644
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -5,7 +5,7 @@ include ../build/rules.make
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 with_mono_path_n11b = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 # force this, we don't case if CSC is broken. This also
 # means we can use --options, yay.
 
@@ -45,7 +45,7 @@ TEST_SUPPORT_FILES = \
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter default net_2_0 net_2_1, $(PROFILE))
+VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1, $(PROFILE))
 ifdef VALID_PROFILE
 
 test-local: $(TEST_SUPPORT_FILES)
@@ -56,7 +56,7 @@ test-local: $(TEST_SUPPORT_FILES)
 run-test-local: run-mcs-tests 
 
 test-everything:
-	$(MAKE) PROFILE=default run-test
+	$(MAKE) PROFILE=net_1_1 run-test
 	$(MAKE) PROFILE=net_2_0 run-test
 
 ifeq (net_2_1, $(PROFILE))
@@ -68,7 +68,7 @@ ifeq (net_2_0, $(PROFILE))
 COMPILER_NAME = gmcs
 TEST_PATTERN = '*cs*.cs'
 endif
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 COMPILER_NAME = mcs
 TEST_PATTERN = 'cs*.cs'
 endif
diff --git a/mcs/ilasm/Makefile b/mcs/ilasm/Makefile
index 7df9413c4e2..97cf9de9359 100644
--- a/mcs/ilasm/Makefile
+++ b/mcs/ilasm/Makefile
@@ -20,7 +20,7 @@ ILParser.cs: parser/ILParser.jay $(topdir)/jay/skeleton.cs
 
 include ../build/executable.make
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 # Utility rule to make debugging somewhat easier.
 all-local: ilasm.exe
 ilasm.exe: $(PROGRAM)
diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 1a67992232b..a0ed8205a78 100644
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -51,7 +51,7 @@ clean-program:
 
 $(PROGRAM) $(PROGRAM).config: $(dir $(PROGRAM))/.stamp
 
-$(PROGRAM): $(topdir)/class/lib/default/mcs.exe
+$(PROGRAM): $(topdir)/class/lib/net_1_1/mcs.exe
 	cp $< $@
 
 $(PROGRAM).config: gmcs.exe.config
diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index e8f05e32225..54cabc28adc 100644
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -11,7 +11,7 @@ DISTFILES += $(wildcard *.cs) $(wildcard *.il) $(wildcard *.xml) $(wildcard *.in
 
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 # force this, we don't case if CSC is broken. This also
 # means we can use --options, yay.
 MCS = $(with_mono_path) $(INTERNAL_MCS)
@@ -28,7 +28,7 @@ USE_MCS_FLAGS :=
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter default net_2_0 net_2_1, $(PROFILE))
+VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1, $(PROFILE))
 ifdef VALID_PROFILE
 # casts
 bootstrap-cast.exe: gen-cast-test.cs
@@ -67,7 +67,7 @@ TEST_PATTERN = '*test-*.cs'
 LOCAL_RUNTIME_FLAGS = --security=validil
 TOPTIONS += '-il:ver-il-gmcs.xml'
 endif
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 COMPILER_NAME = mcs
 TEST_PATTERN = 'test-*.cs'
 LOCAL_RUNTIME_FLAGS = --security=validil
@@ -92,7 +92,7 @@ run-test-local: $(TEST_ILS:.il=.dll) eval-test
 	$(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:known-issues-$(COMPILER_NAME) -log:$(COMPILER_NAME).log $(TOPTIONS)
 
 test-everything:
-	$(MAKE) PROFILE=default run-test
+	$(MAKE) PROFILE=net_1_1 run-test
 	$(MAKE) PROFILE=net_2_0 run-test
 
 test-generics:
@@ -112,7 +112,7 @@ dist-local: dist-default
 %-lib.dll: %-lib.il
 	$(ILASM) /dll /out:$@ $<
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 run-test-local: ilasm
 ilasm:
 	$(ILASM) /dll property-il.il
diff --git a/mcs/tools/corcompare/Makefile b/mcs/tools/corcompare/Makefile
index 1d2b99692fb..eaa8c36c96b 100644
--- a/mcs/tools/corcompare/Makefile
+++ b/mcs/tools/corcompare/Makefile
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 ALL_PROGRAMS = $(topdir)/class/lib/$(PROFILE)/mono-api-info.exe
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 ALL_PROGRAMS += CorCompare.exe mono-api-info.exe mono-api-diff.exe transform.exe
 endif
 
@@ -66,7 +66,7 @@ $(topdir)/class/lib/$(PROFILE)/mono-api-info.exe: $(APIINFO_SOURCES)
 mono-api-info.exe: $(topdir)/class/lib/$(PROFILE)/mono-api-info.exe
 	cp $< $@
 	-cp $<.mdb $@.mdb
-	
+
 transform.exe: transform.cs
 	$(CSCOMPILE) -out:$@ $^
-	
+
diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
index f1f7e5ffe66..91bef5d09a0 100644
--- a/mcs/tools/security/Makefile
+++ b/mcs/tools/security/Makefile
@@ -14,7 +14,7 @@ SN_SOURCES = sn.cs StrongNameManager.cs $(HELPER_SOURCES)
 
 SECURITY_SOURCES = $(HELPER_SOURCES) $(SN_SOURCES) $(SECURITY_PROGRAMS:.exe=.cs) $(SECURITY_PROGRAMS_2_0:.exe=.cs)
 
-ifeq (default, $(PROFILE))
+ifeq (net_1_1, $(PROFILE))
 SECURITY_TARGETS = $(SECURITY_PROGRAMS)
 else
 SECURITY_TARGETS = $(SECURITY_PROGRAMS_2_0)
diff --git a/mcs/tools/tuner/Makefile b/mcs/tools/tuner/Makefile
index 79a2ac8c814..fa5d0d02504 100644
--- a/mcs/tools/tuner/Makefile
+++ b/mcs/tools/tuner/Makefile
@@ -101,7 +101,7 @@ $(OUTPUT_FILES): tune.stamp
 
 tune.stamp: $(WORKING_FILES) $(OUTPUT_DIR)/.stamp
 	touch $@t
-	MONO_PATH=".$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(LINKER) $(TUNER_FLAGS) $(TUNER_DESCS:%=-x %) $(TUNER_STEPS:%=-s %) $(TUNER_MASTERS:%=-i %)
+	MONO_PATH=".$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_1_1$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) --debug $(LINKER) $(TUNER_FLAGS) $(TUNER_DESCS:%=-x %) $(TUNER_STEPS:%=-s %) $(TUNER_MASTERS:%=-i %)
 	for i in $(DLLFILES); do $(SN) $(SNFLAGS) $(OUTPUT_DIR)/$$i $(topdir)/class/mono.snk; done
 	mv $@t $@