diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:03 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:03 +0000 |
| commit | ed268e16385ebaedb55041e062c18ffd2d652968 (patch) | |
| tree | 0cdb9ad17dbd9d80c7f05e0fa436408b78a79f37 | |
| parent | c53be4f0d67bb78299865d1f2aac741a3a4959ad (diff) | |
| download | ruby-ed268e16385ebaedb55041e062c18ffd2d652968.tar.gz ruby-ed268e16385ebaedb55041e062c18ffd2d652968.tar.xz ruby-ed268e16385ebaedb55041e062c18ffd2d652968.zip | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | ext/ripper/depend | 2 |
4 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Tue Feb 24 17:58:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * 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. #### @@ -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 \ |