summaryrefslogtreecommitdiff
path: root/mkconfig.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-16 06:27:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-04-16 06:27:43 +0000
commit57f7725cc01a030b88aae3c64b752a1cc7ba3c48 (patch)
tree317d66288a7f36f7ac24b68e4e2e4048812f81bb /mkconfig.rb
parent3fea4ffc9e76ed406901c8280edf8c25066c78db (diff)
* 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
Diffstat (limited to 'mkconfig.rb')
-rw-r--r--mkconfig.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/mkconfig.rb b/mkconfig.rb
index 246e2c6..b4897e6 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 <<EOS
'$'
elsif key = config[v]
config[v] = false
- Config::expand(key, config)
+ Config::expand(key, config)
config[v] = key
else
var