From 3da834800e40980d7a75b82cc1a3b1abd9539e99 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 12 Apr 2013 09:42:06 +0000 Subject: [PATCH] * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ common.mk | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 391d1d55db..66b5029b92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Apr 12 18:29:42 2013 Tanaka Akira + + * 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 * vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not diff --git a/common.mk b/common.mk index 8221ed80e4..d996bc501d 100644 --- a/common.mk +++ b/common.mk @@ -763,7 +763,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \ {$(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)