nobu	2018-06-02 21:17:16 +0900 (Sat, 02 Jun 2018)

  New Revision: 63557

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63557

  Log:
    gmake.mk: update in the source directory properly

  Modified files:
    trunk/Makefile.in
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 63556)
+++ defs/gmake.mk	(revision 63557)
@@ -139,7 +139,16 @@ $(TIMESTAMPDIR)/.exec.time: https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L139
 .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
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 63556)
+++ Makefile.in	(revision 63557)
@@ -421,7 +421,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L421
 	fi
 	$(Q) touch $@
 
-probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
+probes.$(OBJEXT): $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
 	@$(ECHO) processing probes in object files
 	$(Q) $(RM) $@
 	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/