akr	2013-04-12 18:42:06 +0900 (Fri, 12 Apr 2013)

  New Revision: 40261

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

  Log:
    * common.mk: version.o depends on $(srcdir)/include/ruby/version.h
      instead of {$(VPATH)}version.h to avoid confusion by VPATH between
      top level version.h and include/ruby/version.h for build in-place.
      [ruby-dev:47249] [Bug #8256]

  Modified files:
    trunk/ChangeLog
    trunk/common.mk

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40260)
+++ ChangeLog	(revision 40261)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Apr 12 18:29:42 2013  Tanaka Akira  <akr@f...>
+
+	* common.mk: version.o depends on $(srcdir)/include/ruby/version.h
+	  instead of {$(VPATH)}version.h to avoid confusion by VPATH between
+	  top level version.h and include/ruby/version.h for build in-place.
+	  [ruby-dev:47249] [Bug #8256]
+
 Fri Apr 12 15:21:24 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not
Index: common.mk
===================================================================
--- common.mk	(revision 40260)
+++ common.mk	(revision 40261)
@@ -763,7 +763,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c https://github.com/ruby/ruby/blob/trunk/common.mk#L763
   {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
   {$(VPATH)}oniguruma.h {$(VPATH)}internal.h {$(VPATH)}constant.h
 version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
-  {$(VPATH)}version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h \
+  $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h \
   verconf.h
 dmyversion.$(OBJEXT): {$(VPATH)}dmyversion.c version.$(OBJEXT)
 

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