summaryrefslogtreecommitdiff
path: root/ext/etc
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-24 13:48:08 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-24 13:48:08 (GMT)
commit8fc8587e05163f0002915d06fbb20386cbcbb2ef (patch)
tree787ee4b27d8199a90fd20b4185814fd6800c22ca /ext/etc
parent9885c1c79fb4316fd754e65b9d3292bab9aaffd4 (diff)
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/etc')
-rw-r--r--ext/etc/etc.c3
-rw-r--r--ext/etc/extconf.rb6
2 files changed, 6 insertions, 3 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 46857c6..d5197eb 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 1e679b5..20a7dd0 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")