ruby-changes:41411
From: naruse <ko1@a...>
Date: Sat, 9 Jan 2016 16:24:40 +0900 (JST)
Subject: [ruby-changes:41411] naruse:r53483 (trunk): Revert r53482 "nmake VPATH"
naruse 2016-01-09 16:24:56 +0900 (Sat, 09 Jan 2016) New Revision: 53483 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53483 Log: Revert r53482 "nmake VPATH" it breaks `make dist`. http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20160109T034902Z.fail.html.gz Modified files: trunk/common.mk trunk/ext/rbconfig/sizeof/depend Index: common.mk =================================================================== --- common.mk (revision 53482) +++ common.mk (revision 53483) @@ -887,7 +887,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $ https://github.com/ruby/ruby/blob/trunk/common.mk#L887 $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ - sed '/AUTOGENERATED/q;s/{.*}//' depend | \ + sed /AUTOGENERATED/q depend | \ $(exec) $(MAKE) -f - $(MFLAGS) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" Index: ext/rbconfig/sizeof/depend =================================================================== --- ext/rbconfig/sizeof/depend (revision 53482) +++ ext/rbconfig/sizeof/depend (revision 53483) @@ -1,7 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/rbconfig/sizeof/depend#L1 -{$(VPATH)}sizes.c: $(top_srcdir)/tool/generic_erb.rb \ - $(top_srcdir)/template/sizes.c.tmpl \ - $(top_srcdir)/configure.in \ - $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb +sizes.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/sizes.c.tmpl $(top_srcdir)/configure.in $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb $(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \ $(top_srcdir)/template/sizes.c.tmpl \ $(top_srcdir)/configure.in \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/