diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-16 06:27:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-16 06:27:43 +0000 |
| commit | 57f7725cc01a030b88aae3c64b752a1cc7ba3c48 (patch) | |
| tree | 317d66288a7f36f7ac24b68e4e2e4048812f81bb | |
| parent | 3fea4ffc9e76ed406901c8280edf8c25066c78db (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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | mkconfig.rb | 13 |
3 files changed, 18 insertions, 6 deletions
@@ -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:36:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * bcc32/Makefile.sub: quick hack... prepend DESTDIR. diff --git a/configure.in b/configure.in index 4a56c235ae..e4980c9a5d 100644 --- a/configure.in +++ b/configure.in @@ -200,6 +200,7 @@ esac AC_PROG_LN_S AC_PROG_MAKE_SET +AC_PROG_INSTALL # checks for UNIX variants that set C preprocessor variables AC_AIX @@ -207,7 +208,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 |