Add stuff from Robert

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

diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index 134e0f3e4038a5f04b4ea25b2960fbcdb618639c..7d5bb28e9908b7bc5fc083289393fdc0cd675483 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Robert Jordan  <robertj@gmx.net>
+
+       * Makefile (net_2_0_SUBDIRS): Add 'mkbundle'.
+
 2006-08-30  Robert Jordan  <robertj@gmx.net>
 
        * Makefile (net_2_0_SUBDIRS): Add 'mono-service'.

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 0fba24f285f7457d2d680fae3089e942d5a118cc..5f99d3f7d7abcbbed33d6c1d218f98c0d7b97e06 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -8,7 +8,7 @@ SUBDIRS = \
 net_1_1_bootstrap_SUBDIRS = gacutil security resgen
 net_2_0_bootstrap_SUBDIRS = resgen
 
-net_2_0_SUBDIRS = corcompare wsdl compiler-tester monop xbuild resgen mono-service
+net_2_0_SUBDIRS = corcompare wsdl compiler-tester monop xbuild resgen mono-service mkbundle
 
 DIST_ONLY_SUBDIRS = xbuild
 

diff --git a/mcs/tools/mkbundle/ChangeLog b/mcs/tools/mkbundle/ChangeLog
index 57609d601d45b7302dd3c13d9d11486682ce9c75..fb20441ce758c2564ad1d96dd87d7f2bca0986bf 100644 (file)
--- a/mcs/tools/mkbundle/ChangeLog
+++ b/mcs/tools/mkbundle/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-01  Robert Jordan  <robertj@gmx.net>
+
+       * Makefile: Enable the NET_2_0 build.
+       
 2006-09-08  Robert Jordan  <robertj@gmx.net>
 
        * mkbundle.cs, TODO: The `-z' option is now supported under

diff --git a/mcs/tools/mkbundle/Makefile b/mcs/tools/mkbundle/Makefile
index 172a3bc6a349f5d1aeff74f9360298141b95f73b..a6dc0a3720a7faa269597d362af4aa72be180956 100644 (file)
--- a/mcs/tools/mkbundle/Makefile
+++ b/mcs/tools/mkbundle/Makefile
@@ -2,7 +2,7 @@ thisdir = tools/mkbundle
 SUBDIRS = 
 include ../../build/rules.make
 
-PROGRAM = mkbundle.exe
+PROGRAM = $(topdir)/class/lib/$(PROFILE)/mkbundle.exe
 
 OTHER_RES = template.c template_z.c