nobu	2010-09-16 08:27:48 +0900 (Thu, 16 Sep 2010)

  New Revision: 29268

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

  Log:
    * ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
      [ruby-core:32394]

  Modified files:
    trunk/ChangeLog
    trunk/ext/etc/extconf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29267)
+++ ChangeLog	(revision 29268)
@@ -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]
+
 Thu Sep 16 06:07:24 2010  Tanaka Akira  <akr@f...>
 
 	* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
Index: ext/etc/extconf.rb
===================================================================
--- ext/etc/extconf.rb	(revision 29267)
+++ ext/etc/extconf.rb	(revision 29268)
@@ -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')

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