nobu	2015-11-01 08:34:17 +0900 (Sun, 01 Nov 2015)

  New Revision: 52415

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

  Log:
    ruby-runner: RUBY_INSTALL_NAME
    
    * Makefile.in (ruby-runner), template/ruby-runner.c.in: use
      expanded RUBY_INSTALL_NAME, not RUBY_BASE_NAME.

  Modified files:
    trunk/Makefile.in
    trunk/template/ruby-runner.c.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 52414)
+++ Makefile.in	(revision 52415)
@@ -256,7 +256,7 @@ ruby-runner.c: template/ruby-runner.c.in https://github.com/ruby/ruby/blob/trunk/Makefile.in#L256
 		@./config.status --file=$@:$(srcdir)/template/$(@F).in
 
 ruby-runner$(EXEEXT): ruby-runner.c
-	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c
+	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c
 
 $(RBCONFIG): $($(CROSS_COMPILING:no=)PREP)
 
Index: template/ruby-runner.c.in
===================================================================
--- template/ruby-runner.c.in	(revision 52414)
+++ template/ruby-runner.c.in	(revision 52415)
@@ -6,7 +6,9 @@ https://github.com/ruby/ruby/blob/trunk/template/ruby-runner.c.in#L6
 #define BUILDDIR "@abs_top_builddir@"
 #define LIBPATHENV "@LIBPATHENV@"
 #define PATH_SEP '@PATH_SEPARATOR@'
-#define RUBY_INSTALL_NAME "@RUBY_BASE_NAME@"
+
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#define STRINGIZE0(expr) #expr
 
 int
 main(int argc, char **argv)
@@ -28,6 +30,6 @@ main(int argc, char **argv) https://github.com/ruby/ruby/blob/trunk/template/ruby-runner.c.in#L30
 	libpath = builddir;
     }
     setenv(LIBPATHENV, libpath, 1);
-    execv(BUILDDIR"/"RUBY_INSTALL_NAME, argv);
+    execv(BUILDDIR"/"STRINGIZE(RUBY_INSTALL_NAME), argv);
     return -1;
 }

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