summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 07:24:56 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 07:24:56 +0000
commit52ddf1f86920cd8b99359771ab00f3cede1a4780 (patch)
tree88ed86f2fdf0915b8552ab32866ad1cb1981c9d8
parent64e228598020b5334b58e88de29cb9ab9a6f3030 (diff)
Revert r53482 "nmake VPATH"
it breaks `make dist`. http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20160109T034902Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk2
-rw-r--r--ext/rbconfig/sizeof/depend5
2 files changed, 2 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index aa1a7b0..4ede19c 100644
--- a/common.mk
+++ b/common.mk
@@ -887,7 +887,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
$(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)"
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 4243785..56564b1 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,7 +1,4 @@
-{$(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 \