revert previous commit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,10 +1,3 @@
-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.

lib/mkmf.rb

@@ -2050,11 +2050,8 @@ 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.sub!(%r'(\s)*\#.*$', '')
-        comment = $& || ''
-        line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
-        line = line.chomp + comment + "\n"
+      elsif RULE_SUBST and /\A(?!\s*\w+\s*=)[$\w][^#]*:/ =~ line
+        line.gsub!(%r"(\s)(?!\.)([^$(){}+=:\s\/\\,]+)(?=\s|\z)") {$1 + RULE_SUBST % $2}
       end
       depout << line
     end

lib/rubygems/core_ext/kernel_require.rb

@@ -66,7 +66,7 @@ module Kernel
 
     begin
       RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(spec.to_fullpath(path) || path)
+      return gem_original_require(path)
     end if spec
 
     # Attempt to find +path+ in any unresolved gems...