From 70c5a6e095ee385b386dc343c6ef2b356cb8ec6e Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 5 Oct 2015 06:29:54 +0000 Subject: ruby-runner.c.in: make macros * template/ruby-runner.c.in (PATH_SEP, RUBY_INSTALL_NAME): move configured values as macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/ruby-runner.c.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/template/ruby-runner.c.in b/template/ruby-runner.c.in index 95cb1e3ef1..c72a56bbbf 100644 --- a/template/ruby-runner.c.in +++ b/template/ruby-runner.c.in @@ -5,6 +5,8 @@ #define BUILDDIR "@abs_top_builddir@" #define LIBPATHENV "@LIBPATHENV@" +#define PATH_SEP '@PATH_SEPARATOR@' +#define RUBY_INSTALL_NAME "@RUBY_BASE_NAME@" int main(int argc, char **argv) @@ -15,7 +17,7 @@ main(int argc, char **argv) size_t n = strlen(libpath); char *e = malloc(sizeof(builddir)+n+1); memcpy(e, builddir, sizeof(builddir)-1); - e[sizeof(builddir)-1] = '@PATH_SEPARATOR@'; + e[sizeof(builddir)-1] = PATH_SEP; memcpy(e+sizeof(builddir), libpath, n+1); libpath = e; } @@ -23,6 +25,6 @@ main(int argc, char **argv) libpath = builddir; } setenv(LIBPATHENV, libpath, 1); - execv(BUILDDIR"/@RUBY_BASE_NAME@", argv); + execv(BUILDDIR"/"RUBY_INSTALL_NAME, argv); return -1; } -- cgit v1.2.3