diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-02 12:17:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-02 12:17:16 +0000 |
| commit | 8a4656c9be86d89237ed6ecc1885801618c57521 (patch) | |
| tree | d3f2ed37b0ba6f9f68922d45155acc3b7212c5da /defs/gmake.mk | |
| parent | 295b1c5e6da8cdbc2b4fcff6608fa544bdfb40d6 (diff) | |
gmake.mk: update in the source directory properly
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs/gmake.mk')
| -rw-r--r-- | defs/gmake.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index d3396dc8e3..63e63ee7a9 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -139,7 +139,16 @@ $(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) srcs_vpath='$(srcdir)/' REVISION_FORCE=PHONY update-src srcs all-incs + +$(Q) \ + { \ + cd "$(srcdir)"; \ + sed 's/^@.*@$$//;s/@[A-Z][A-Z_0-9]*@//g;/^all-incs:/d' defs/gmake.mk Makefile.in; \ + sed 's/{[.;]*$$([a-zA-Z0-9_]*)}//g' common.mk; \ + } | \ + $(MAKE) $(mflags) Q=$(Q) srcdir="$(srcdir)" srcs_vpath="$(srcdir)/" CHDIR="$(CHDIR)" \ + BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \ + VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY -f - \ + update-src srcs all-incs ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2) extract-gems: update-gems |