diff --git a/ChangeLog b/ChangeLog index 58d81709b6..502b86b550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 18 15:43:59 2007 Nobuyoshi Nakada + + * 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 * lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore. diff --git a/common.mk b/common.mk index 80940d8ebf..e30b1a3eaa 100644 --- a/common.mk +++ b/common.mk @@ -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=. ##