diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 09:37:10 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 09:37:10 +0000 |
| commit | f3244de816f85acbecbd231cbf091cfd6ec1b72a (patch) | |
| tree | 5e16e95cde8e512f2c922bb9da16bad154cee3be /ext | |
| parent | 483d85b157a58960314f0d5150433ceda24f6c1a (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/etc/extconf.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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') |