X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=ceccf4e45086980bd74d038c9c22dec3bc22e0ba;hb=83569e1ef07325ec30b00d3e2b955718f210e608;hp=8a2fd6550883dc4a3baf0bf6500fbd7812aacc4e;hpb=af90548a08ef5effc93b083b7eec44daa178b141;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 8a2fd655088..ceccf4e4508 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -6,11 +6,12 @@ tmpinst = _tmpinst
 noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper
 
 etctmp = etc
-symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config 
+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/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
 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
 
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -18,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
@@ -26,7 +31,7 @@ endif
 if BUILD_MCS
 
 # The write check is to foil 'make distcheck'
-all-local: $(SUPPORT_FILES)
+all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
 	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
 	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
 
@@ -34,7 +39,7 @@ all-local: $(SUPPORT_FILES)
 install: install-exec install-data
 
 # override automake
-install-exec: $(SUPPORT_FILES)
+install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
 	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
 
 # override automake
@@ -53,11 +58,7 @@ clean-local:
 
 endif BUILD_MCS
 
-if INSTALL_2_0
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
-else
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
-endif
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
 
 # now a misnomer, but it'll go away soon enough.
 if ENABLE_NUNIT_TESTS
@@ -70,7 +71,6 @@ mcs-do-test-profiles:
 	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
-	d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \
 	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
 
 if PLATFORM_WIN32
@@ -109,34 +109,30 @@ etc/mono/config: ../data/config Makefile $(symlinks)
 	mv -f $@t $@
 
 $(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/mbas:
-	$(MAKE) test-support-file target=$@ file=mbas/mbas.exe
-
-$(tmpinst)/bin/gmcs:
-	$(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
-
-$(tmpinst)/bin/ilasm:
-	$(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe
-
-test-support-files:
-	$(mkinstalldirs) $(tmpinst)/bin
-	$(MAKE) $(TEST_SUPPORT_FILES)
+$(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 $@
 
-test-support-file:
-	echo '#! /bin/sh' > $(target)
-	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/mono-wrapper"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
-	chmod +x $(target)
+$(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/pedump: $(srcdir)/Makefile.am
-	$(mkdir_p) $(@D)
-	(b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
+$(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)
+	@:
+
 # the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
 MYDISTFILES = $(DIST_COMMON)
 distdir: $(MYDISTFILES)