From b51cd234cf7840c80cc9a78e487ee884af0c67d4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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/trunk@8338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 11 ++++++++++-
 configure.in |  2 +-
 mkconfig.rb  | 13 ++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed458b14fd..ac98201bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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.
+
 Sat Apr 16 10:33:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
@@ -57,7 +66,7 @@ Thu Apr 14 05:35:45 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 Thu Apr 14 00:20:31 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
 	* bin/irb lib/irb.rb lib/irb/...: IRB 0.9.5.
-	
+
 Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
diff --git a/configure.in b/configure.in
index afd9628201..be313d5989 100644
--- a/configure.in
+++ b/configure.in
@@ -195,6 +195,7 @@ esac
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
+AC_PROG_INSTALL
 
 # checks for UNIX variants that set C preprocessor variables
 AC_AIX
@@ -202,7 +203,6 @@ AC_MINIX
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
-AC_SUBST(INSTALL, ['install -p'])
 if $as_mkdir_p; then
   AC_SUBST(MAKEDIRS, ['mkdir -p'])
 else
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 <<EOS
 	'$'
       elsif key = config[v]
 	config[v] = false
-        Config::expand(key, config)
+	Config::expand(key, config)
 	config[v] = key
       else
 	var
-- 
cgit v1.2.3