diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | mkconfig.rb | 23 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 20 insertions, 11 deletions
@@ -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 diff --git a/mkconfig.rb b/mkconfig.rb index e5d9c806b..d715cc40d 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)}" @@ -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[]; |