From ed268e16385ebaedb55041e062c18ffd2d652968 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 3 Mar 2009 11:40:03 +0000 Subject: merges r22591 from trunk into ruby_1_9_1. -- * common.mk (ripper.c): exec can't work on Windows. * ext/ripper/depend (.SUFFIXES): nmake doesn't have .y by default. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ Makefile.in | 1 + common.mk | 2 +- ext/ripper/depend | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a0c76e775..94e619482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 24 17:58:07 2009 Nobuyoshi Nakada + + * common.mk (ripper.c): exec can't work on Windows. + + * ext/ripper/depend (.SUFFIXES): nmake doesn't have .y by default. + + * Makefile.in (id.h): overwrites unconditinally. + Tue Feb 24 13:13:49 2009 Nobuyoshi Nakada * missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than diff --git a/Makefile.in b/Makefile.in index df308004a..c29dcf352 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,6 @@ SHELL = /bin/sh NULLCMD = : +exec = exec #### Start of system configuration section. #### diff --git a/common.mk b/common.mk index 9c4aeefdb..9a5c7d092 100644 --- a/common.mk +++ b/common.mk @@ -672,7 +672,7 @@ $(srcdir)/revision.h: $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/fil @$(IFCHANGE) "$@" "$@.tmp" $(srcdir)/ext/ripper/ripper.c: - cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. + cd $(srcdir)/ext/ripper && $(exec) $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=. ## diff --git a/ext/ripper/depend b/ext/ripper/depend index e8a53e436..306a75ca9 100644 --- a/ext/ripper/depend +++ b/ext/ripper/depend @@ -3,6 +3,8 @@ SRC1 = $(top_srcdir)/parse.y SRC2 = $(srcdir)/eventids2.c BISON = bison +.SUFFIXES: .y + src: ripper.c eventids1.c eventids2table.c ripper.o: ripper.c lex.c eventids1.c eventids2.c eventids2table.c \ -- cgit