diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-25 14:03:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-25 14:03:10 +0000 |
commit | ef728bb3278cc8ff5b0bf383b011f6c942842fe0 (patch) | |
tree | 3b7b1a0fc0a9e5564a1eaf08b3e4d2df27ab06fb | |
parent | b65b16f6891ac57f7e24b101b72389f523463dd7 (diff) | |
download | ruby-ef728bb3278cc8ff5b0bf383b011f6c942842fe0.tar.gz ruby-ef728bb3278cc8ff5b0bf383b011f6c942842fe0.tar.xz ruby-ef728bb3278cc8ff5b0bf383b011f6c942842fe0.zip |
* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | mkconfig.rb | 35 |
3 files changed, 20 insertions, 20 deletions
@@ -1,3 +1,7 @@ +Sun Jun 25 23:02:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in, mkconfig.rb: catch-up for latest autoconf. + Sun Jun 25 17:44:16 2006 Tanaka Akira <akr@m17n.org> * parse.y (paren_args): wrap $2 by escape_Qundef because it may be diff --git a/Makefile.in b/Makefile.in index e4ece254f..8b56a410e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,6 +18,7 @@ bindir = @bindir@ sbindir = @sbindir@ libdir = @libdir@ libexecdir = @libexecdir@ +datarootdir = @datarootdir@ datadir = @datadir@ arch = @arch@ sitearch = @sitearch@ diff --git a/mkconfig.rb b/mkconfig.rb index 9af94f760..9de524c78 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -38,25 +38,28 @@ vars = {} has_version = false File.foreach "config.status" do |line| next if /^#/ =~ line - line.gsub!(/\|#_!!_#\|/, '') - if /^s[%,]@program_transform_name@[%,]s(\\?.)(.*)\1[%,]/ =~ line - next if $install_name - sep = Regexp.quote($1) - ptn = $2.sub(/\$\$/, '$').split(/#{sep}/,2) - v_fast << " CONFIG[\"ruby_install_name\"] = \"" + "ruby".sub(/#{ptn[0]}/,ptn[1]) + "\"\n" - elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line - name = $1 - val = $2 || "" + if /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/ =~ line + name = $2 + val = $3.gsub(/\\(?=,)/, '') next if /^(?:ac_.*|DEFS|configure_input)$/ =~ name next if /^\$\(ac_\w+\)$/ =~ val next if /^\$\{ac_\w+\}$/ =~ val next if /^\$ac_\w+$/ =~ val next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name + if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val + next if $install_name + sep = %r"#{Regexp.quote($1)}" + ptn = $2.sub(/\$\$/, '$').split(sep, 2) + name = "ruby_install_name" + val = "ruby".sub(/#{ptn[0]}/, ptn[1]) + end val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM - v = " CONFIG[\"" + name + "\"] #{vars[name] ? '<<' : ''}= " + - (vars[name] ? '"\n" ' : '') + - val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + "\n" + val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + if /^prefix$/ =~ name + val = "(TOPDIR || DESTDIR + #{val})" + end + v = " CONFIG[\"#{name}\"] #{vars[name] ? '<< "\n"' : '='} #{val}\n" vars[name] = true if fast[name] v_fast << v @@ -70,14 +73,6 @@ File.foreach "config.status" do |line| # break if /^CEOF/ end -v_fast.collect! do |x| - if /"prefix"/ === x - x.sub(/= (.*)/, '= (TOPDIR || DESTDIR + \1)') - else - x - end -end - drive = File::PATH_SEPARATOR == ';' prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM |