From bb7e19c8e9ca34991dedbe2da84db5605cc80834 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 16 Feb 2013 04:40:17 +0000 Subject: [PATCH] configure.in: don't substitute exec_prefix itself * configure.in (shvar_to_cpp): do not substitute exec_prefix itself with RUBY_EXEC_PREFIX, which cause recursive definition. [ruby-core:52296] [Bug #7860] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ configure.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 35cc04684b..be09593390 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 16 13:40:13 2013 Nobuyoshi Nakada + + * configure.in (shvar_to_cpp): do not substitute exec_prefix itself + with RUBY_EXEC_PREFIX, which cause recursive definition. + [ruby-core:52296] [Bug #7860] + Sat Feb 16 13:13:04 2013 Nobuyoshi Nakada * ext/io/console/io-console.gemspec: bump to 0.4.2. now explicitly diff --git a/configure.in b/configure.in index 8a3f458a3b..86b5e80ec5 100644 --- a/configure.in +++ b/configure.in @@ -3218,7 +3218,7 @@ shvar_to_cpp() { -e 's/\${rubyarchprefix}/"RUBY_ARCH_PREFIX_FOR(arch)"/g' \ -e 's/\${rubysitearchprefix}/"RUBY_SITEARCH_PREFIX_FOR(arch)"/g' \ -e 's/\${exec_prefix}/"RUBY_EXEC_PREFIX"/g' \ - -e "s|${exec_prefix_pat}|"'"RUBY_EXEC_PREFIX"|g' \ + -e "s|${exec_prefix_pat}/|"'"RUBY_EXEC_PREFIX"/|g' \ -e "s|${arch_pat}|"'"arch"|g' \ -e "s|${sitearch_pat}|"'"sitearch"|g' \ -e 's|^\"NONE/|RUBY_EXEC_PREFIX\"/|' \