2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a6084e9ffd..4f31c76219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
+	  not includedir, the latter is outside the ruby installation.
+	  [ruby-core:72496] [Bug #11881]
+
 Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@gmail.com>
 
 	* test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index fdba7097d6..c14d1ef715 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -131,7 +131,7 @@ File.foreach "config.status" do |line|
       if universal
         val.sub!(/universal/, %q[#{arch && universal[/(?:\A|\s)#{Regexp.quote(arch)}=(\S+)/, 1] || '\&'}])
       end
-    when /^includedir$/
+    when /^oldincludedir$/
       val = '"$(SDKROOT)"'+val if /darwin/ =~ arch
     end
     v = "  CONFIG[\"#{name}\"] #{eq} #{val}\n"