From b5cda0ffb61a2552e45d64728329a211fe51413a Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 15 Nov 2014 10:43:12 +0000
Subject: [PATCH] * lib/mkmf.rb (depend_rules): support comments during a line.

* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
  file contains path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                               | 7 +++++++
 lib/mkmf.rb                             | 7 +++++--
 lib/rubygems/core_ext/kernel_require.rb | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d05ae44843..5ce6b6252f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Nov 15 19:40:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (depend_rules): support comments during a line.
+
+	* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
+	  file contains path.
+
 Sat Nov 15 19:25:46 2014  Tanaka Akira  <akr@fsij.org>
 
 	* common.mk: Remove comments in Dependency lines.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1eb52047a3..d801a6ad8b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2050,8 +2050,11 @@ RULES
         suffixes << m[1] << m[2]
         implicit = [[m[1], m[2]], [m.post_match]]
         next
-      elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
-        line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
+    elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+        line.sub!(%r'(\s)*\#.*$', '')
+        comment = $& || ''
+        line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
+        line = line.chomp + comment + "\n"
       end
       depout << line
     end
diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index bf9618d3bf..8f2cddee4d 100755
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -66,7 +66,7 @@ module Kernel
 
     begin
       RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(path)
+      return gem_original_require(spec.to_fullpath(path) || path)
     end if spec
 
     # Attempt to find +path+ in any unresolved gems...