Author: wade
Date: 2007-11-01 00:14:24 -0500 (Thu, 01 Nov 2007)
New Revision: 88624
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/Makefile
Log:
2007-10-31 Wade Berrier <[EMAIL PROTECTED]>
* Makefile: reenable copy of gmcs.exe.config, but include it in
EXTRA DIST (it doesn't get included because PROGRAM isn't defined to
be gmcs during 'make dist')
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2007-11-01 04:14:00 UTC (rev 88623)
+++ trunk/mcs/mcs/ChangeLog 2007-11-01 05:14:24 UTC (rev 88624)
@@ -1,3 +1,9 @@
+2007-10-31 Wade Berrier <[EMAIL PROTECTED]>
+
+ * Makefile: reenable copy of gmcs.exe.config, but include it in EXTRA
+ DIST (it doesn't get included because PROGRAM isn't defined to be gmcs
+ during 'make dist')
+
2007-10-31 Marek Safar <[EMAIL PROTECTED]>
A fix for bug #338102
Modified: trunk/mcs/mcs/Makefile
===================================================================
--- trunk/mcs/mcs/Makefile 2007-11-01 04:14:00 UTC (rev 88623)
+++ trunk/mcs/mcs/Makefile 2007-11-01 05:14:24 UTC (rev 88624)
@@ -11,14 +11,15 @@
generic.cs \
linq.cs \
NOTES \
- TODO
+ TODO \
+ gmcs.exe.config
GMCS_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_2_1, $(PROFILE))
ifdef GMCS_PROFILE
BUILT_SOURCES = gcs-parser.cs
LOCAL_MCS_FLAGS += -d:GMCS_SOURCE
-
+
ifeq (net_2_1, $(PROFILE))
INTERNAL_SMCS = $(INTERNAL_GMCS)
LOCAL_MCS_FLAGS += -nowarn:618 -noconfig -r:mscorlib
-r:System.dll
@@ -56,10 +57,12 @@
$(MKINSTALLDIRS) $(@D)
touch $@
-$(PROGRAM): $(topdir)/class/lib/default/mcs.exe $(progdir)/.stamp
+$(PROGRAM) $(PROGRAM).config: $(progdir)/.stamp
+
+$(PROGRAM): $(topdir)/class/lib/default/mcs.exe
cp $< $@
-$(PROGRAM).config: $(progdir)/.stamp
+$(PROGRAM).config: gmcs.exe.config
cp $< $@
else
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches