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)