X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=ceccf4e45086980bd74d038c9c22dec3bc22e0ba;hb=831403d104705c81d2fdb98473855da2e3076311;hp=29ae8f4372e0ed6346b5e1505f0a76900bfefa14;hpb=300aa9de015784d08efacae4abb61852cbdf1e50;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 29ae8f4372e..ceccf4e4508 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -19,7 +19,11 @@ $(symlinks):
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if INSTALL_2_0
+if INSTALL_2_1
+build_profiles = default net_2_0 net_2_1
+else
 build_profiles = default net_2_0
+endif
 else
 build_profiles = default
 endif
@@ -108,24 +112,27 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
 	$(mkinstalldirs) $(tmpinst)/bin
 	cp mono-wrapper $@
 
-$(tmpinst)/bin/mcs:
-	$(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
+$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/default/mcs.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
 
-$(tmpinst)/bin/gmcs:
-	$(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
+$(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/gmcs/gmcs.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
 
-$(tmpinst)/bin/ilasm:
-	$(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe
+$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
 
 test-support-files: $(TEST_SUPPORT_FILES)
 	@:
 
-test-support-file: $(tmpinst)/bin/mono
-	test -n '$(target)$(file)'
-	echo '#! /bin/sh' > $(target)
-	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
-	chmod +x $(target)
-
 # the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
 MYDISTFILES = $(DIST_COMMON)
 distdir: $(MYDISTFILES)