diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-24 13:48:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-24 13:48:08 +0000 |
| commit | 79114772c08a66103504db08af41cea746103f91 (patch) | |
| tree | 787ee4b27d8199a90fd20b4185814fd6800c22ca /ext | |
| parent | b6c56e67545b206329da9a2a07a61546e7ece94e (diff) | |
| download | ruby-79114772c08a66103504db08af41cea746103f91.tar.gz | |
sysconfdir on Windows
* ext/etc/etc.c (etc_sysconfdir): mentioned special case on
Windows. [ruby-core:43110] [Bug #6121]
* ext/etc/extconf.rb: define SYSCONFDIR only if sysconfdir is set
in RbConfig::CONFIG and not empty.
* win32/Makefile.sub (config.status): sysconfdir is not used on
Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/etc/etc.c | 3 | ||||
| -rw-r--r-- | ext/etc/extconf.rb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 46857c62c7..d5197eb566 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -628,7 +628,8 @@ VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc); * * This is typically "/etc", but is modified by the prefix used when Ruby was * compiled. For example, if Ruby is built and installed in /usr/local, returns - * "/usr/local/etc". + * "/usr/local/etc" on other than Windows. On Windows, this returns system + * provided directory always. */ static VALUE etc_sysconfdir(VALUE obj) diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb index 1e679b5d0b..20a7dd00d6 100644 --- a/ext/etc/extconf.rb +++ b/ext/etc/extconf.rb @@ -12,8 +12,10 @@ have_func("uname((struct utsname *)NULL)", headers) have_func("getlogin") have_func("getpwent") have_func("getgrent") -sysconfdir = RbConfig.expand(RbConfig::CONFIG["sysconfdir"].dup, "prefix"=>"", "DESTDIR"=>"") -$defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}") +if (sysconfdir = RbConfig::CONFIG["sysconfdir"] and + !RbConfig.expand(sysconfdir.dup, "prefix"=>"", "DESTDIR"=>"").empty?) + $defs.push("-DSYSCONFDIR=#{Shellwords.escape(sysconfdir.dump)}") +end have_func("sysconf") have_func("confstr") |