summaryrefslogtreecommitdiffstats
path: root/mkconfig.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-20 04:59:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-01-20 04:59:39 +0000
commita2af08da0c33d2dcde870b491f62a8bd0c1c6b81 (patch)
treefeb35473da45947378fbc02defe39bcd79ef600e /mkconfig.rb
parentc5f4657aaa8a92db27dc722dee741f1b8e0da809 (diff)
downloadruby-a2af08da0c33d2dcde870b491f62a8bd0c1c6b81.tar.gz
ruby-a2af08da0c33d2dcde870b491f62a8bd0c1c6b81.tar.xz
ruby-a2af08da0c33d2dcde870b491f62a8bd0c1c6b81.zip
This commit was generated by cvs2svn to compensate for changes in r372,
which included commits to RCS files with non-trunk default branches. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
-rw-r--r--mkconfig.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkconfig.rb b/mkconfig.rb
index 5232943d8..903cddad3 100644
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -26,14 +26,14 @@ v_others = []
File.foreach "config.status" do |$_|
next if /^#/
if /^s%@program_transform_name@%s,(.*)%g$/
- ptn = $1.sub(/\$\$/, '$').split(/,/)
+ ptn = $1.sub(/\$\$/, '$').split(/,/) #'
v_fast << " CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(ptn[0],ptn[1]) + "\"\n"
elsif /^s%@(\w+)@%(.*)%g/
name = $1
val = $2 || ""
next if name =~ /^(INSTALL|DEFS|configure_input|srcdir|top_srcdir)$/
v = " CONFIG[\"" + name + "\"] = " +
- val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$\{?([^}]*)\}?/) {
+ val.sub(/^\s*(.*)\s*$/, '"\1"').gsub(/\$[{(]?([^})]+)[})]?/) {
"\#{CONFIG[\\\"#{$1}\\\"]}"
} + "\n"
if fast[name]