diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-24 11:15:20 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-24 11:15:20 +0000 |
| commit | 1333c0f0df4a82fd128425e273f03cd689138917 (patch) | |
| tree | 180fad8de3f1a701e54cda4a1dced873429fd6d2 | |
| parent | f18caee9914fd3f8bb9ef66cd955ad4f0ac7cc0a (diff) | |
Revert "sysconfdir on Windows"
This reverts commit r60279.
This breaks mswin build:
https://ci.appveyor.com/project/ruby/ruby/build/1.0.5571
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60399 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, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6c15929..6c7436c 100644 --- a/configure.ac +++ b/configure.ac @@ -512,7 +512,6 @@ 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 d5197eb..46857c6 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -628,8 +628,7 @@ 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" on other than Windows. On Windows, this returns system - * provided directory always. + * "/usr/local/etc". */ static VALUE etc_sysconfdir(VALUE obj) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ccf7c5b..1780759 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -829,6 +829,7 @@ 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 |