summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 02:32:18 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 02:32:18 +0000
commit8fe729a6b0fa50d315729112ab21e71f0d46de96 (patch)
tree47b99a848963120506d81bbd4f001f57c427210d
parent0fe8a7529e40cd093705922fcc01d83a61e08d4e (diff)
downloadruby-8fe729a6b0fa50d315729112ab21e71f0d46de96.tar.gz
ruby-8fe729a6b0fa50d315729112ab21e71f0d46de96.tar.xz
ruby-8fe729a6b0fa50d315729112ab21e71f0d46de96.zip
Place bin dir before lib dir so gem bin stubs work.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gem_prelude.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ca8820c02..97beb0df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 22 11:31:14 2007 Eric Hodel <drbrain@segment7.net>
+
+ * gem_prelude.rb: Place bin dir before lib dir so gem bin stubs work.
+
Sat Dec 22 11:05:44 2007 Jim Weirich <jim@tardis.local>
* lib/rake.rb (Rake): Added Rake and related libraries to the
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 88ffe1753..d2c54d3fa 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -152,8 +152,8 @@ module Gem
if File.exist?(File.join(path, ".require_paths"))
require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)})
else
- require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin"))
+ require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
end
end
@@ -186,4 +186,4 @@ rescue Exception => e
end
#puts "Gem load in #{Time.now - t} seconds"
-end # Gem::Enable \ No newline at end of file
+end # Gem::Enable