mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r29268 from trunk into ruby_1_9_2.
-- * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR. [ruby-core:32394] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
483d85b157
commit
f3244de816
3 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Thu Sep 16 08:27:36 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
|
||||
[ruby-core:32394]
|
||||
|
||||
Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
|
||||
|
||||
* test/net/imap/test_imap.rb: "localhost" not guaranteed to
|
||||
|
|
|
@ -4,7 +4,7 @@ have_library("sun", "getpwnam") # NIS (== YP) interface for IRIX 4
|
|||
a = have_func("getlogin")
|
||||
b = have_func("getpwent")
|
||||
c = have_func("getgrent")
|
||||
sysconfdir = RbConfig.expand(RbConfig::MAKEFILE_CONFIG["sysconfdir"].dup, "prefix"=>"")
|
||||
sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"")
|
||||
$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
|
||||
if a or b or c or sysconfdir
|
||||
have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define RUBY_VERSION "1.9.2"
|
||||
#define RUBY_PATCHLEVEL 44
|
||||
#define RUBY_PATCHLEVEL 45
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
#define RUBY_VERSION_MINOR 9
|
||||
#define RUBY_VERSION_TEENY 1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue