kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* Makefile.in, mkconfig.rb: catch-up for latest autoconf.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-06-25 14:03:10 +00:00
parent 6f9183d650
commit 439600afbd
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 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 * parse.y (paren_args): wrap $2 by escape_Qundef because it may be

1
Makefile.in
View file

@ -18,6 +18,7 @@ bindir = @bindir@
sbindir = @sbindir@ sbindir = @sbindir@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@
arch = @arch@ arch = @arch@
sitearch = @sitearch@ sitearch = @sitearch@

35
mkconfig.rb
View file

@ -38,25 +38,28 @@ vars = {}
has_version = false has_version = false
File.foreach "config.status" do |line| File.foreach "config.status" do |line|
next if /^#/ =~ line next if /^#/ =~ line
line.gsub!(/\|#_!!_#\|/, '') if /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/ =~ line
if /^s[%,]@program_transform_name@[%,]s(\\?.)(.*)\1[%,]/ =~ line name = $2
next if $install_name val = $3.gsub(/\\(?=,)/, '')
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 || ""
next if /^(?:ac_.*|DEFS|configure_input)$/ =~ name next if /^(?:ac_.*|DEFS|configure_input)$/ =~ name
next if /^\$\(ac_\w+\)$/ =~ val next if /^\$\(ac_\w+\)$/ =~ val
next if /^\$\{ac_\w+\}$/ =~ val 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 $install_name and /^RUBY_INSTALL_NAME$/ =~ name
next if $so_name and /^RUBY_SO_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 val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM
v = " CONFIG[\"" + name + "\"] #{vars[name] ? '<<' : ''}= " + val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
(vars[name] ? '"\n" ' : '') + if /^prefix$/ =~ name
val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + "\n" val = "(TOPDIR || DESTDIR + #{val})"
end
v = " CONFIG[\"#{name}\"] #{vars[name] ? '<< "\n"' : '='} #{val}\n"
vars[name] = true vars[name] = true
if fast[name] if fast[name]
v_fast << v v_fast << v
@ -70,14 +73,6 @@ File.foreach "config.status" do |line|
# break if /^CEOF/ # break if /^CEOF/
end end
v_fast.collect! do |x|
if /"prefix"/ === x
x.sub(/= (.*)/, '= (TOPDIR || DESTDIR + \1)')
else
x
end
end
drive = File::PATH_SEPARATOR == ';' drive = File::PATH_SEPARATOR == ';'
prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM