(MCS_DIRS, MCS_FILES, MONO_CSHARP_DEBUGGER_DIR, MONO_CSHARP_DEBUGGER_FILE):

Avoid automake conditional/+= problems.

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

diff --git a/ChangeLog b/ChangeLog
index 0041a08dd79506b97034a3b633cbb57245e82f7e..e66ab66831720f3dadf27fa8d8cac6e3e715d07c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
        (populate-runtime-subdir): Make into subroutine that takes list of
        profiles to populate.
        (faststrap): Update.
+       (MCS_DIRS, MCS_FILES, MONO_CSHARP_DEBUGGER_DIR, MONO_CSHARP_DEBUGGER_FILE): 
+       Avoid automake conditional/+= problems.
 
 2004-06-16  Raja R Harinath  <rharinath@novell.com>
 

diff --git a/Makefile.am b/Makefile.am
index 786f16f0478d33a708b92d6f2d7d805dbe0d6bcb..c7140b13e101324abf6f43e14dde901e26c819ae 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,8 +45,8 @@ MCS_BASIC_FILES = \
 
 # Set of directories and files the 'mcs' compiler can use
 ## We build class/System twice to resolve the cyclic dependency of class/System.XML
-MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System
-MCS_FILES = $(MCS_BASIC_FILES) $(mcs_topdir)/class/lib/default/System.Xml.dll
+MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System $(MONO_CSHARP_DEBUGGER_DIR)
+MCS_FILES = $(MCS_BASIC_FILES) $(mcs_topdir)/class/lib/default/System.Xml.dll $(MONO_CSHARP_DEBUGGER_FILE)
 
 tmpinst = _tmpinst
 
@@ -60,8 +60,8 @@ bootstrap: tmpinst-dir
 
 else
 
-MCS_DIRS += class/Mono.CSharp.Debugger
-MCS_FILES += $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
+MONO_CSHARP_DEBUGGER_DIR = class/Mono.CSharp.Debugger
+MONO_CSHARP_DEBUGGER_FILE = $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
 
 bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only
        $(MAKE) tmpinst-mcs-short-build