diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | wince/Makefile.sub | 2 |
5 files changed, 23 insertions, 8 deletions
@@ -1,3 +1,18 @@ +Mon Dec 24 11:56:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk: should not pass MAKEFLAGS to recursive make. + + normal make: MFLAGS are set and command line options and macros + are all passed silently. + + GNU make: ditto, and all options and macros in MAKEFLAGS are in + effect. + + nmake: MFLAGS is not set and MAKEFLAGS has only options without + hyphen, no macros exist in any variables. + + Borland make: ditto, and command line macros cannot override + macros in makefile, so passing them is vain. + + * {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. + Mon Dec 24 11:32:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (rb_str_comparable): fixed to keep transitivity. @@ -6,19 +21,19 @@ Mon Dec 24 11:32:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Dec 24 11:20:31 2007 Eric Hodel <drbrain@segment7.net> * lib/rdoc/ri/ri_options.rb: Fix display of GEMDIRS, make command - examples match ri's name. + examples match ri's name. * lib/rdoc/ri/ri_paths.rb: Only allow latest ri dirs in ri output. Mon Dec 24 10:49:04 2007 Eric Hodel <drbrain@segment7.net> * lib/uri/mailto.rb, lib/uri/common.rb: Fix Regexp warnings. Patch - #16524 from Kornelius Kalnbach, [ruby-core:14302]. + #16524 from Kornelius Kalnbach, [ruby-core:14302]. Mon Dec 24 10:37:38 2007 Eric Hodel <drbrain@segment7.net> * gem_prelude.rb: Remove methods from Gem, not QuickLoader, to fix - warnings. + warnings. Mon Dec 24 09:45:45 2007 Martin Duerst <duerst@it.aoyama.ac.jp> diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 4ff86f8e74..cba378ac89 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -388,7 +388,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,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t s,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj,;t t @@ -342,7 +342,7 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) encs: enc.mk $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc" - $(MAKE) -f enc.mk $(MFLAGS) $(MAKEFLAGS) + $(MAKE) -f enc.mk $(MFLAGS) enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(srcdir)/lib/mkmf.rb $(RBCONFIG) @@ -666,7 +666,7 @@ revision.h: exit > $@ $(srcdir)/ext/ripper/ripper.c: - cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) $(MAKEFLAGS) top_srcdir=../.. srcdir=. + cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. ## diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ffe25d5e2b..bf8ddf8d57 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -429,7 +429,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,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t s,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj,;t t diff --git a/wince/Makefile.sub b/wince/Makefile.sub index c60ac9e921..d55f68bdee 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -383,7 +383,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,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t s,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj isinf.obj isnan.obj,;t t |