diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-17 04:14:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-17 04:14:51 +0000 |
| commit | 3029014467c634c6b767e131c4d3f9beb3e44932 (patch) | |
| tree | d0bd75c62624f52ebb5344dd82d5213f427136c5 | |
| parent | 08adad00ff5d9e567b2cc547e9f5a7ed33c8cb7a (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | tool/runruby.rb | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index cabff9b9d2..5ac7d558d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -414,7 +414,7 @@ clean-local:: $(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 @@ -777,12 +777,12 @@ $(PLATFORM_D): $(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) diff --git a/configure.in b/configure.in index ad94b75e5f..6b4d5e46b1 100644 --- a/configure.in +++ b/configure.in @@ -4028,7 +4028,7 @@ AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [ 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)] ) ]) diff --git a/tool/runruby.rb b/tool/runruby.rb index 23d835536e..20f37487a9 100755 --- a/tool/runruby.rb +++ b/tool/runruby.rb @@ -74,7 +74,7 @@ env = { '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 |