summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 18:19:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 18:19:14 +0000
commitc4bdd0f1ef95a14cb89fee15a5cd3c4ac7e49047 (patch)
treec41d70df8e07682f8751fa77d1790c578089dd5c
parent1f2d6dc72e90ae6bdcf303b192fb2dad22993178 (diff)
downloadbundler-c4bdd0f1ef95a14cb89fee15a5cd3c4ac7e49047.tar.gz
* common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 137232cb7b..16d3e5a736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 23 03:19:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (encs, ext/ripper/ripper.c): MAKEFLAGS needs -.
+
Sun Dec 23 01:56:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_mode_enc): do not set encoding unless explicitly
diff --git a/common.mk b/common.mk
index ddf83f8a52..5914b7f762 100644
--- a/common.mk
+++ b/common.mk
@@ -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) -$(MAKEFLAGS)
enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
$(srcdir)/lib/mkmf.rb $(RBCONFIG)
@@ -661,7 +661,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) -$(MAKEFLAGS) top_srcdir=../.. srcdir=.
##