summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 23:27:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 23:27:48 +0000
commitafd241f7ee13dd228fdfe1b1af87b33c4d96d46a (patch)
tree868fa3742b5cd0d4011d1faa8d82db7456ff285a
parentd0e9ac151e4b508221de5118ee653fafec3851c0 (diff)
* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
[ruby-core:32394] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/etc/extconf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d127c2..60f30a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]
+
Thu Sep 16 06:07:24 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 7293d7b..1967560 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')