diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-03 22:38:54 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-03 22:38:54 +0000 |
commit | c2b381c5c0d04f760182882fe2ec2e6dc1908dd6 (patch) | |
tree | 788ed43d8154764d03edc78e38266548b9490a99 /mkconfig.rb | |
parent | ae846f9fb810ecd241a20579495a94a15212ca56 (diff) |
* mkconfig.rb (sitearch): default to arch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mkconfig.rb')
-rwxr-xr-x | mkconfig.rb | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/mkconfig.rb b/mkconfig.rb index e5d9c806ba..d715cc40d9 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -69,15 +69,20 @@ File.foreach "config.status" do |line| end if name - next if /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ 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 - next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name - next if /^(?:MAJOR|MINOR|TEENY)$/ =~ name - arch = val if name == "arch" + case name + when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next + when /^(?:X|(?:MINI|RUN)RUBY$)/; next + when /^(?:MAJOR|MINOR|TEENY)$/; next + when /^RUBY_INSTALL_NAME$/; next if $install_name + when /^RUBY_SO_NAME$/; next if $so_name + when /^arch$/; if val.empty? then val = arch else arch = val end + when /^sitearch/; val = '$(arch)' if val.empty? + end + case val + when /^\$\(ac_\w+\)$/; next + when /^\$\{ac_\w+\}$/; next + when /^\$ac_\w+$/; next + end if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val next if $install_name sep = %r"#{Regexp.quote($1)}" |