yugui	2010-11-24 18:37:10 +0900 (Wed, 24 Nov 2010)

  New Revision: 29912

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29912

  Log:
    merges r29268 from trunk into ruby_1_9_2.
    --
    * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
      [ruby-core:32394]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/etc/extconf.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29911)
+++ ruby_1_9_2/ChangeLog	(revision 29912)
@@ -1,3 +1,8 @@
+Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
+	  [ruby-core:32394]
+
 Wed Sep 15 13:37:00 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
Index: ruby_1_9_2/ext/etc/extconf.rb
===================================================================
--- ruby_1_9_2/ext/etc/extconf.rb	(revision 29911)
+++ ruby_1_9_2/ext/etc/extconf.rb	(revision 29912)
@@ -4,7 +4,7 @@
 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')
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29911)
+++ ruby_1_9_2/version.h	(revision 29912)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/