summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 08:49:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-09 08:49:56 +0000
commitf6dcbf7472429fef251e2478fb89c7f091504d11 (patch)
tree69e8fefd32332f3099675da3a927bcc5e9d1fd35
parent52ddf1f86920cd8b99359771ab00f3cede1a4780 (diff)
nmake VPATH
* ext/rbconfig/sizeof/depend (sizes.c): add nmake VPATH prefix. reapply r53482 with '#' as separator not to be removed in make-snapshot. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk2
-rw-r--r--ext/rbconfig/sizeof/depend5
2 files changed, 5 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 4ede19c..e4d7bda 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 depend | \
+ sed '/AUTOGENERATED/q;s#{.*}##' 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 56564b1..4243785 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,4 +1,7 @@
-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
+{$(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
$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
$(top_srcdir)/template/sizes.c.tmpl \
$(top_srcdir)/configure.in \