Quick fix to get the tree building again. The configure.in change is

probably correct, the Makefile.am one isn't.  Hari will have to fix this
properly.

svn path=/trunk/mono/; revision=36438

diff --git a/Makefile.am b/Makefile.am
index 92e7b517aba45554b0f1d54cfd7557d3982fa901..17cea8a64041ffd98d6b4ae7af369827b62b3c2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data scripts man samples support web 
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools
+DIST_SUBDIRS = libgc mono ikvm-jni docs data scripts man samples support web tools
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 

diff --git a/configure.in b/configure.in
index f7b025dbdaab8e6885170df5c2707d91c5f25287..1fa7baf9573988260c49dc9b63ee540f85508631 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1497,8 +1497,6 @@ mono/mini/Makefile
 mono/profiler/Makefile
 ikvm-jni/Makefile
 runtime/Makefile
-runtime/net_1_1/Makefile
-runtime/net_2_0/Makefile
 scripts/Makefile
 man/Makefile
 web/Makefile