kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.

Browse source 
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
This commit is contained in:
nobu 2005-04-16 06:27:43 +00:00
parent 3fea4ffc9e
commit 57f7725cc0
3 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> Sat Apr 16 10:36:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: quick hack... prepend DESTDIR. * bcc32/Makefile.sub: quick hack... prepend DESTDIR.

2
configure.in
View file

@ -200,6 +200,7 @@ esac
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_INSTALL
# checks for UNIX variants that set C preprocessor variables # checks for UNIX variants that set C preprocessor variables
AC_AIX AC_AIX
@ -207,7 +208,6 @@ AC_MINIX
AC_SUBST(RM, ['rm -f']) AC_SUBST(RM, ['rm -f'])
AC_SUBST(CP, ['cp']) AC_SUBST(CP, ['cp'])
AC_SUBST(INSTALL, ['install -p'])
if $as_mkdir_p; then if $as_mkdir_p; then
AC_SUBST(MAKEDIRS, ['mkdir -p']) AC_SUBST(MAKEDIRS, ['mkdir -p'])
else else

11
mkconfig.rb
View file

@ -44,7 +44,10 @@ File.foreach "config.status" do |line|
elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line elsif /^s[%,]@(\w+)@[%,](.*)[%,]/ =~ line
name = $1 name = $1
val = $2 || "" 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 $install_name and /^RUBY_INSTALL_NAME$/ =~ name
next if $so_name and /^RUBY_SO_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name
v = " CONFIG[\"" + name + "\"] = " + v = " CONFIG[\"" + name + "\"] = " +
@ -55,7 +58,7 @@ File.foreach "config.status" do |line|
v_others << v v_others << v
end end
has_version = true if name == "MAJOR" has_version = true if name == "MAJOR"
elsif /^ac_given_INSTALL=(.*)/ =~ line elsif /^(?:ac_given_)?INSTALL=(.*)/ =~ line
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n" v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"
end end
# break if /^CEOF/ # break if /^CEOF/
@ -71,8 +74,8 @@ end
drive = File::PATH_SEPARATOR == ';' drive = File::PATH_SEPARATOR == ';'
prefix = Regexp.quote('/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM) prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
print " TOPDIR = File.dirname(__FILE__).sub!(%r'#{prefix}\\Z', '')\n" print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
print " CONFIG = {}\n" print " CONFIG = {}\n"
print " CONFIG[\"DESTDIR\"] = DESTDIR\n" print " CONFIG[\"DESTDIR\"] = DESTDIR\n"