summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-09 02:10:58 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-01-09 02:10:58 +0000
commite6358072514105ec4fbe39a308637834642fb15d (patch)
tree6d7bf3c19c0be60bf123b72a9231627cfca75105
parent3644cddb1912634009ec65a4cfa0a2b0807ab23d (diff)
gmake.mk: update srcdir files
* defs/gmake.mk (commit): update source files under the sources directory after commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk3
-rw-r--r--defs/gmake.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 2175f67..b599d08 100644
--- a/common.mk
+++ b/common.mk
@@ -888,7 +888,8 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
-common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \
+srcs-vpath = {$(VPATH)}
+common-srcs: $(srcs-vpath)parse.c $(srcs-vpath)lex.c $(srcs-vpath)enc/trans/newline.c $(srcs-vpath)id.c \
srcs-lib srcs-ext incs
missing-srcs: $(srcdir)/missing/des_tables.c
diff --git a/defs/gmake.mk b/defs/gmake.mk
index d961e27..30da65db 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -139,7 +139,7 @@ $(TIMESTAMPDIR)/.exec.time:
.PHONY: commit
commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS)))
@$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit'
- $(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY update-src srcs all-incs
+ $(Q)$(MAKE) $(mflags) Q=$(Q) srcs-vpath='$(srcdir)/' REVISION_FORCE=PHONY update-src srcs all-incs
ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
extract-gems: update-gems