2008-02-05 Zoltan Varga <vargaz@gmail.com>

	* Makefile: Abort with an error message if make is typed directly in this
	directory, instead from the 'mono' directory.

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

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index b4032a1410ff7f95dfd74d13b1a3be5f94e11a61..40925d3bbb350fa335b8904e4eda6484966dc231 100644 (file)
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-05  Zoltan Varga  <vargaz@gmail.com>
+
+       * Makefile: Abort with an error message if make is typed directly in this 
+       directory, instead from the 'mono' directory.
+
 2007-12-06  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Makefile: currently Sys.Web.Extensions is not ready for

diff --git a/mcs/Makefile b/mcs/Makefile
index 4202be7f8b7f3ad98a6c3b8ad7d225a8fcd1f998..b33aad15c461befa604dabb9d3b3b2c9a3be1066 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -39,12 +39,12 @@ net_2_0_centum_tests := \
        class/Microsoft.Build.Framework \
        class/Microsoft.Build.Utilities \
        class/Microsoft.Build.Engine
-       #class/Microsoft.Build.Tasks    
-       #class/Mono.C5
-       
+#class/Microsoft.Build.Tasks   
+#class/Mono.C5
+
 net_3_5_centum_tests := \
        class/System.Xml.Linq
-       #class/System.Web.Extensions            
+#class/System.Web.Extensions           
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -56,12 +56,15 @@ endif
 
 include build/rules.make
 
-all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
+all-recursive $(STD_TARGETS:=-recursive): dir-check platform-check profile-check
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
        @:
 
+dir-check:
+       @if [ "$(NO_DIR_CHECK)" = "" ]; then echo "Running make from the mcs directory is not supported. Run make from the parent directory (if using a tarball), or from the directory where the runtime is checked out (if using an SVN checkout)."; exit 1; fi
+
 # fun specialty targets
 
 PROFILES = default net_2_0 net_3_5