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

* mkconfig.rb (sitearch): default to arch.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-03 22:38:54 +00:00
parent ae846f9fb8
commit c2b381c5c0
3 changed files with 20 additions and 11 deletions

View file

@ -1,3 +1,7 @@
Sat Apr 4 07:38:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* mkconfig.rb (sitearch): default to arch.
Fri Apr 3 14:02:42 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/irb/completion.rb (IRB::InputCompletor::Operators): Add

View file

@ -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)}"

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-04-03"
#define RUBY_RELEASE_DATE "2009-04-04"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 3
#define RUBY_RELEASE_DAY 4
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];