diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | mkconfig.rb | 35 |
3 files changed, 22 insertions, 22 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. + Sat Jun 24 06:35:00 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> * signal.c: revert last change. @@ -23,8 +27,8 @@ Wed Jun 21 21:28:32 2006 Tadayoshi Funaba <tadf@dotrb.org> Wed Jun 21 17:32:31 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> - * signal.c (ruby_nativethread_signal, posix_nativethread_signal, - sigsend_to_ruby_thread, install_nativethread_sighandler): + * signal.c (ruby_nativethread_signal, posix_nativethread_signal, + sigsend_to_ruby_thread, install_nativethread_sighandler): nativethread-support on signal handler (backport from 1.9). * ruby.h (HAVE_NATIVETHREAD_KILL): ditto. diff --git a/Makefile.in b/Makefile.in index d03aa007ff..8104217687 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 74db915cee..5858287734 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -38,24 +38,27 @@ 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 - v = " CONFIG[\"" + name + "\"] #{vars[name] ? '<<' : ''}= " + - (vars[name] ? '"\n" ' : '') + - val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump + "\n" + 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 = 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 @@ -69,14 +72,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 |