aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-07-02 16:30:55 -0300
committerEmilio Tagua <miloops@gmail.com>2009-07-02 16:30:55 -0300
commitcd424f0f320e6657091bee2265933b0f4b9ec65d (patch)
tree294e07b4c908a4fbf33bcabec4dbe656a7fe89e8 /railties/lib
parent084e4a2dd4322c9ea748a426cb37bf90ab83613d (diff)
parent49bdbebca69cabea6e4cea6e09cb61dc990bb1f7 (diff)
downloadrails-cd424f0f320e6657091bee2265933b0f4b9ec65d.tar.gz
rails-cd424f0f320e6657091bee2265933b0f4b9ec65d.tar.bz2
rails-cd424f0f320e6657091bee2265933b0f4b9ec65d.zip
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/gem_dependency.rb10
1 files changed, 7 insertions, 3 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3cc75494e4..06d830ba24 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -122,10 +122,14 @@ module Rails
def built?
return false unless frozen?
- specification.extensions.each do |ext|
- makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
- return false unless File.exists?(makefile)
+
+ if vendor_gem?
+ specification.extensions.each do |ext|
+ makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+ return false unless File.exists?(makefile)
+ end
end
+
true
end