diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-18 06:44:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-18 06:44:25 +0000 |
| commit | e1e7d2264ba2f0dc658af1875270d741d46d311a (patch) | |
| tree | b67da91bc0be8f93a80fdf27e322c47195686b94 | |
| parent | 9f01e34cb9a45c6ef9423c79b3421310584d69d6 (diff) | |
| download | ruby-e1e7d2264ba2f0dc658af1875270d741d46d311a.tar.gz ruby-e1e7d2264ba2f0dc658af1875270d741d46d311a.tar.xz ruby-e1e7d2264ba2f0dc658af1875270d741d46d311a.zip | |
* common.mk (encs, ext/ripper/ripper.c): other options must come
before MAKEFLAGS in GNU make.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Dec 18 15:43:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (encs, ext/ripper/ripper.c): other options must come + before MAKEFLAGS in GNU make. + Tue Dec 18 15:19:55 2007 Eric Hodel <drbrain@segment7.net> * lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore. @@ -340,7 +340,7 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -so_name=$(RUBY_SO_NAME) rbconfig.rb encs: enc.mk - $(MAKE) -$(MAKEFLAGS) -f enc.mk + $(MAKE) -f enc.mk -$(MAKEFLAGS) enc.mk: miniruby$(EXEEXT) $(srcdir)/enc/make_encmake.rb \ $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend $(srcdir)/lib/mkmf.rb @@ -655,7 +655,7 @@ docs: $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) $(srcdir)/ext/ripper/ripper.c: - cd ext/ripper && exec $(MAKE) -$(MAKEFLAGS) -f depend top_srcdir=../.. srcdir=. + cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend -$(MAKEFLAGS) top_srcdir=../.. srcdir=. ## |