nobu	2017-10-21 23:19:23 +0900 (Sat, 21 Oct 2017)

  New Revision: 60279

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60279

  Log:
    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.

  Modified files:
    trunk/configure.ac
    trunk/ext/etc/etc.c
    trunk/win32/Makefile.sub
Index: configure.ac
===================================================================
--- configure.ac	(revision 60278)
+++ configure.ac	(revision 60279)
@@ -627,6 +627,7 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L627
 	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}
     ],
Index: ext/etc/etc.c
===================================================================
--- ext/etc/etc.c	(revision 60278)
+++ ext/etc/etc.c	(revision 60279)
@@ -628,7 +628,8 @@ VALUE rb_w32_conv_from_wchar(const WCHAR https://github.com/ruby/ruby/blob/trunk/ext/etc/etc.c#L628
  *
  * 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)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 60278)
+++ win32/Makefile.sub	(revision 60279)
@@ -829,7 +829,6 @@ s,@bindir@,$${exec_prefix}/bin,;t t https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L829
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/