diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 14:19:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 14:19:23 +0000 |
| commit | 78a0f60818669707b3d2248b10190476c599fc76 (patch) | |
| tree | 086ecf0183ce8ae8ad6b13ad05efde962151c2b4 | |
| parent | 6393ee705336f922635e6821ab114dc743f30ef0 (diff) | |
| download | ruby-78a0f60818669707b3d2248b10190476c599fc76.tar.gz | |
sysconfdir on Windows
* ext/etc/etc.c (etc_sysconfdir): mentioned special case on
Windows. [ruby-core:43110] [Bug #6121]
* win32/Makefile.sub (config.status): sysconfdir is not used on
Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ext/etc/etc.c | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 84e42848d4..30fe9e5512 100644 --- a/configure.ac +++ b/configure.ac @@ -627,6 +627,7 @@ AS_CASE(["$target_os"], RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]` test "$RT_VER" = "" && RT_VER=60 AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER) + sysconfdir= ]) : ${enable_shared=yes} ], 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/win32/Makefile.sub b/win32/Makefile.sub index 17807593db..ccf7c5bb47 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -829,7 +829,6 @@ s,@bindir@,$${exec_prefix}/bin,;t t s,@sbindir@,$${exec_prefix}/sbin,;t t s,@libexecdir@,$${exec_prefix}/libexec,;t t s,@datadir@,$${prefix}/share,;t t -s,@sysconfdir@,$${prefix}/etc,;t t s,@sharedstatedir@,/etc,;t t s,@localstatedir@,/var,;t t s,@libdir@,$${exec_prefix}/$(libdir_basename),;t t |