From f3244de816f85acbecbd231cbf091cfd6ec1b72a Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 24 Nov 2010 09:37:10 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ext/etc/extconf.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbbed2efd3..e028100cd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 16 08:27:36 2010 Nobuyoshi Nakada + + * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR. + [ruby-core:32394] + Wed Sep 15 13:37:00 2010 URABE Shyouhei * test/net/imap/test_imap.rb: "localhost" not guaranteed to diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 7293d7b805..1967560cd4 100644 --- a/ext/etc/extconf.rb +++ b/ext/etc/extconf.rb @@ -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') diff --git a/version.h b/version.h index 92c832f4d0..eefac72ed6 100644 --- a/version.h +++ b/version.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