From a593186a02714cb92ae2748c2b7c46a6c50b0977 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 29 Nov 2019 11:09:08 +0900
Subject: Nmake needs `VPATH`

---
 ext/psych/extconf.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index a47e1dd518..fec541b453 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -15,8 +15,10 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
 
   $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)}.sort
 
+  header = 'yaml/yaml.h'
   if have_macro("_WIN32")
     $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
+    header = "{$(VPATH)}#{header}"
   end
 
   have_header 'dlfcn.h'
@@ -32,11 +34,10 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
 
   find_header 'yaml.h'
   have_header 'config.h'
-  bundled = true
 end
 
 create_makefile 'psych' do |mk|
-  mk << "YAML_H =#{' yaml/yaml.h' if bundled}\n"
+  mk << "YAML_H = #{header}".strip << "\n"
 end
 
 # :startdoc:
-- 
cgit v1.2.3