1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.

Browse Source 
[ruby-core:32394]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-09-15 23:27:48 +00:00
parent d0e9ac151e
commit afd241f7ee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Thu Sep 16 06:07:24 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated * ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated

2
ext/etc/extconf.rb
View File

@ -4,7 +4,7 @@ have_library("sun", "getpwnam") # NIS (== YP) interface for IRIX 4
a = have_func("getlogin") a = have_func("getlogin")
b = have_func("getpwent") b = have_func("getpwent")
c = have_func("getgrent") 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)}") $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}")
if a or b or c or sysconfdir if a or b or c or sysconfdir
have_struct_member('struct passwd', 'pw_gecos', 'pwd.h') have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')