From afd241f7ee13dd228fdfe1b1af87b33c4d96d46a Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 15 Sep 2010 23:27:48 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ ext/etc/extconf.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7d127c26f0..60f30a9a51 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] + Thu Sep 16 06:07:24 2010 Tanaka Akira * ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated 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')