yugui	2009-03-03 20:40:03 +0900 (Tue, 03 Mar 2009)

  New Revision: 22736

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22736

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/common.mk
    branches/ruby_1_9_1/ext/ripper/depend

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 22735)
+++ ruby_1_9_1/ChangeLog	(revision 22736)
@@ -1,3 +1,11 @@
+Tue Feb 24 17:58:07 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* missing/vsnprintf.c (BSD_vfprintf): ptrdiff_t may be larger than
Index: ruby_1_9_1/common.mk
===================================================================
--- ruby_1_9_1/common.mk	(revision 22735)
+++ ruby_1_9_1/common.mk	(revision 22736)
@@ -672,7 +672,7 @@
 	@$(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=.
 
 ##
 
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 22735)
+++ ruby_1_9_1/Makefile.in	(revision 22736)
@@ -1,5 +1,6 @@
 SHELL = /bin/sh
 NULLCMD = :
+exec = exec
 
 #### Start of system configuration section. ####
 
Index: ruby_1_9_1/ext/ripper/depend
===================================================================
--- ruby_1_9_1/ext/ripper/depend	(revision 22735)
+++ ruby_1_9_1/ext/ripper/depend	(revision 22736)
@@ -3,6 +3,8 @@
 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 \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/