nobu	2017-09-17 13:14:51 +0900 (Sun, 17 Sep 2017)

  New Revision: 59937

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

  Log:
    Rename bin/ruby as exe/ruby
    
    * common.mk, configure.in: rename the bin directory to run build
      executable as exe, to get rid of overwriting true files at the
      installation.  [ruby-dev:50250] [Bug #13911]

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.in
    trunk/tool/runruby.rb
Index: configure.in
===================================================================
--- configure.in	(revision 59936)
+++ configure.in	(revision 59937)
@@ -4028,7 +4028,7 @@ AS_CASE("$cross_compiling:${LIBPATHENV}" https://github.com/ruby/ruby/blob/trunk/configure.in#L4028
     AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
     AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
 	[AC_MSG_RESULT(no)],
-	[PREP="$PREP"' bin/$(PROGRAM)'
+	[PREP="$PREP"' exe/$(PROGRAM)'
 	AC_MSG_RESULT(yes)]
     )
 ])
Index: common.mk
===================================================================
--- common.mk	(revision 59936)
+++ common.mk	(revision 59937)
@@ -777,12 +777,12 @@ $(PLATFORM_D): https://github.com/ruby/ruby/blob/trunk/common.mk#L777
 	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
 	@exit > $@
 
-bin/$(PROGRAM): ruby-runner.c ruby-runner.h $(TIMESTAMPDIR)/.bin.time
+exe/$(PROGRAM): ruby-runner.c ruby-runner.h exe/.time
 	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(@F) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
 
-$(TIMESTAMPDIR)/.bin.time:
-	$(Q) $(MAKEDIRS) bin $(@D)
-	$(Q) exit > $@
+exe/.time:
+	$(Q) $(MAKEDIRS) exe $(@D)
+	@exit > $@
 
 $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 59936)
+++ Makefile.in	(revision 59937)
@@ -414,7 +414,7 @@ clean-local:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L414
 	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
 		enc/encinit.c enc/encinit.$(OBJEXT)
 	-$(Q)$(RM) $(pkgconfig_DATA)
-	-$(Q)$(RMALL) bin/$(PROGRAM) ruby-runner.h *.dSYM
+	-$(Q)$(RMALL) exe/ ruby-runner.h *.dSYM
 
 distclean-local::
 	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
Index: tool/runruby.rb
===================================================================
--- tool/runruby.rb	(revision 59936)
+++ tool/runruby.rb	(revision 59937)
@@ -74,7 +74,7 @@ env = { https://github.com/ruby/ruby/blob/trunk/tool/runruby.rb#L74
   'RUBY_FIBER_MACHINE_STACK_SIZE' => '1',
 }
 
-runner = File.join(abs_archdir, "bin/ruby#{config['EXEEXT']}")
+runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}")
 runner = nil unless File.exist?(runner)
 abs_ruby = runner || File.expand_path(ruby)
 env["RUBY"] = abs_ruby

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