2007-10-19 Marek Habersack <mhabersack@novell.com>

	* Makefile: include consts.cs.in in the dist tarball.
	Extra distribution files should be named in EXTRA_DISTFILES.

2007-10-19  Marek Habersack  <mhabersack@novell.com>

	* Makefile: fix the buildbot build - mconfig should be
	listed also in DIST_ONLY_SUBDIRS

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

diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index 07aff1665bb2d23fa31a90c60283ab6831c2350d..e5eb32d6f929a25f6a70f00ad6261111d4f77dd1 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Marek Habersack  <mhabersack@novell.com>
+
+       * Makefile: fix the buildbot build - mconfig should be
+       listed also in DIST_ONLY_SUBDIRS
+
 2007-10-19  Marek Habersack  <mhabersack@novell.com>
 
        * Makefile (net_2_0_SUBDIRS): added mconfig to the build

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index d44c450bcf318e5e8ee772ba4bbe23031dab1785..b7fe1c78a0225242191f72ece7ccc500a45ddcd8 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -11,7 +11,7 @@ net_2_0_bootstrap_SUBDIRS = resgen
 net_2_0_SUBDIRS = al corcompare wsdl compiler-tester monop xbuild resgen mono-service mkbundle sgen security mconfig
 net_2_1_SUBDIRS = tuner
 
-DIST_ONLY_SUBDIRS = xbuild sgen
+DIST_ONLY_SUBDIRS = xbuild sgen mconfig
 
 include ../build/rules.make
 

diff --git a/mcs/tools/mconfig/ChangeLog b/mcs/tools/mconfig/ChangeLog
index 0138a1cc82b55f3cdfc1e8bdb2f3cfca8bde7d3c..8999b6d6e88e060f5b4270b4fcddc545a23815ee 100644 (file)
--- a/mcs/tools/mconfig/ChangeLog
+++ b/mcs/tools/mconfig/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-19  Marek Habersack  <mhabersack@novell.com>
+
+       * Makefile: include consts.cs.in in the dist tarball.
+       Extra distribution files should be named in EXTRA_DISTFILES.
+
 2007-10-19  Marek Habersack  <mhabersack@novell.com>
 
        * Makefile (DISTFILES): added

diff --git a/mcs/tools/mconfig/Makefile b/mcs/tools/mconfig/Makefile
index 78522196a7c60c90c27963659a768d1ce630f6c1..22c06d67be34c802177c2cb5d12bef75c287c3c6 100644 (file)
--- a/mcs/tools/mconfig/Makefile
+++ b/mcs/tools/mconfig/Makefile
@@ -16,6 +16,6 @@ install-local-data:
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/etc/mono/mconfig/
        $(INSTALL_DATA) data/config.xml $(DESTDIR)$(prefix)/etc/mono/mconfig
 
-DISTFILES = TODO data/config.xml Mono.MonoConfig/consts.cs
+EXTRA_DISTFILES = TODO data/config.xml Mono.MonoConfig/consts.cs.in
 
 include ../../build/executable.make