naruse	2017-10-24 20:15:20 +0900 (Tue, 24 Oct 2017)

  New Revision: 60399

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

  Log:
    Revert "sysconfdir on Windows"
    
    This reverts commit r60279.
    This breaks mswin build:
    https://ci.appveyor.com/project/ruby/ruby/build/1.0.5571

  Modified files:
    trunk/configure.ac
    trunk/ext/etc/etc.c
    trunk/win32/Makefile.sub
Index: ext/etc/etc.c
===================================================================
--- ext/etc/etc.c	(revision 60398)
+++ ext/etc/etc.c	(revision 60399)
@@ -628,8 +628,7 @@ 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" on other than Windows.  On Windows, this returns system
- * provided directory always.
+ * "/usr/local/etc".
  */
 static VALUE
 etc_sysconfdir(VALUE obj)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 60398)
+++ win32/Makefile.sub	(revision 60399)
@@ -829,6 +829,7 @@ 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
Index: configure.ac
===================================================================
--- configure.ac	(revision 60398)
+++ configure.ac	(revision 60399)
@@ -512,7 +512,6 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L512
 	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}
     ],

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