From 57f7725cc01a030b88aae3c64b752a1cc7ba3c48 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 16 Apr 2005 06:27:43 +0000 Subject: * configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL. files need timestamps to be kept are only ar-archive on a few platforms, and be installed by instruby.rb but not INSTALL. fixed: [ruby-core:04721] * mkconfig.rb: purge autoconf value variables. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mkconfig.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mkconfig.rb') diff --git a/mkconfig.rb b/mkconfig.rb index 246e2c6abf..b4897e6aaa 100644 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -44,7 +44,10 @@ File.foreach "config.status" do |line| elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line name = $1 val = $2 || "" - next if /^(?:ac_.*|DEFS|configure_input|.*(?:src|build)dir)$/ =~ 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 $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name v = " CONFIG[\"" + name + "\"] = " + @@ -55,7 +58,7 @@ File.foreach "config.status" do |line| v_others << v end has_version = true if name == "MAJOR" - elsif /^ac_given_INSTALL=(.*)/ =~ line + elsif /^(?:ac_given_)?INSTALL=(.*)/ =~ line v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" end # break if /^CEOF/ @@ -71,8 +74,8 @@ end drive = File::PATH_SEPARATOR == ';' -prefix = Regexp.quote('/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM) -print " TOPDIR = File.dirname(__FILE__).sub!(%r'#{prefix}\\Z', '')\n" +prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM +print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " CONFIG = {}\n" print " CONFIG[\"DESTDIR\"] = DESTDIR\n" @@ -118,7 +121,7 @@ print <