5 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ea28536b8e..95a9e40e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
+	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
+
 Sat Dec 22 14:49:46 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 93452bea01..cbdff389a2 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -346,7 +346,7 @@ s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
diff --git a/version.h b/version.h
index b63f8c1fa9..f9edcd4622 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-12-19"
+#define RUBY_RELEASE_DATE "2007-12-24"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071219
+#define RUBY_RELEASE_CODE 20071224
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 955f634862..30eb6908f3 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -366,7 +366,7 @@ s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index dbcad66c1c..ca1c4421bb 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -353,7 +353,7 @@ s,@RANLIB@,,;t t
 s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS),;t t
 s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
+s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
 s,@CP@,copy > nul,;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t