X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=1b9881a2f08c33dc45b4de4f3a5533dba65f5df1;hb=b3e660af62c1ec9f73bfc0b83ab82d037e998f0b;hp=c807bf32b01de78955c05ce7223dcb9ec6ef32ec;hpb=79315c7fbbfc91d0b582f24e35c098cd49715657;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index c807bf32b01..1b9881a2f08 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -16,29 +16,25 @@ $(symlinks):
 
 SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config
 
-# The write check is to foil 'make distcheck'
-all-local: $(SUPPORT_FILES)
-	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
-	d=`pwd`; ok=:; \
-	( cd $(mcs_topdir) && \
-	  $(MAKE) PROFILES='$(build_profiles)' all-profiles ) || ok=false; \
-	./semdel-wrapper || :; $$ok
-
 if INSTALL_2_0
 build_profiles = default net_2_0
 else
 build_profiles = default
 endif
 
+if BUILD_MCS
+
+# The write check is to foil 'make distcheck'
+all-local: $(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
+
 # override automake
 install: install-exec install-data
 
 # override automake
 install-exec: $(SUPPORT_FILES)
-	d=`pwd`; ok=:; \
-	( cd $(mcs_topdir) && \
-	  $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles ) || ok=false; \
-	./semdel-wrapper || :; $$ok
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
 
 # override automake
 install-data:
@@ -46,17 +42,16 @@ install-data:
 
 # override automake
 uninstall:
-	d=`pwd`; ok=:; \
-	( cd $(mcs_topdir) && \
-	  $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ) || ok=false; \
-	./semdel-wrapper || :; $$ok
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
 
 ## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
 clean-local:
-	d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
 	-./semdel-wrapper
 	-rm -fr $(etctmp) $(tmpinst) .wapi
 
+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
@@ -71,14 +66,11 @@ test_select = ONLY_CENTUM_TESTS=yes
 endif
 
 mcs-do-test-profiles:
-	d=`pwd`; ok=:; \
-	( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles ) || ok=false; \
-	./semdel-wrapper || :; $$ok
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
 
 mcs-do-run-test-profiles: test-support-files
-	d=`pwd`; ok=:; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \
-	( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ok=false; \
-	./semdel-wrapper || :; rm -fr $(tmpinst); $$ok
+	d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
 
 if PLATFORM_WIN32
 cur_dir_cmd = cygpath -w -a .
@@ -99,7 +91,7 @@ mcs-compileall: mono-wrapper wrapper-config
 	    else \
 	      echo $$i verification failed; ok=false; \
 	    fi; done; done; \
-	./semdel-wrapper || :; $$ok
+	$$ok
 
 check-local: mcs-compileall mcs-do-test-profiles
 	$(MAKE) $(test_select) mcs-do-run-test-profiles