Description: avoid overriding $LOAD_PATH
 The needed paths are already in $LOAD_PATH
Author: Cédric Boutillier <cedric.boutillier@gmail.com>
Forwarded: not-needed
Last-Update: 2012-06-14

--- a/lib/ferret.rb
+++ b/lib/ferret.rb
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 # :include: ../TUTORIAL
-$: << File.expand_path(File.join(File.dirname(__FILE__), "../ext"))
+#$: << File.expand_path(File.join(File.dirname(__FILE__), "../ext"))
 require 'ferret_ext'
 require 'ferret/version'
 require 'ferret/document'
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,11 +1,12 @@
 $:.unshift File.dirname(__FILE__)
-if $test_installed_gem
-  require 'rubygems'
-  require 'ferret'
-else
-  $:.unshift File.join(File.dirname(__FILE__), '../lib')
-  $:.unshift File.join(File.dirname(__FILE__), '../ext')
-end
+#if $test_installed_gem
+#  require 'rubygems'
+#  require 'ferret'
+#else
+#  $:.unshift File.join(File.dirname(__FILE__), '../lib')
+#  $:.unshift File.join(File.dirname(__FILE__), '../ext')
+#end
+require 'ferret'
 
 ENV['LANG'] = "en_US.UTF-8"
 ENV['LC_CTYPE'] = "en_US.UTF-8"
--- a/bin/ferret-browser
+++ b/bin/ferret-browser
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path(File.join(File.basename(__FILE__), '../lib'))
+#$: << File.expand_path(File.join(File.basename(__FILE__), '../lib'))
 require 'ferret'
 require 'ferret/browser'
 
--- a/test/threading/thread_safety_index_test.rb
+++ b/test/threading/thread_safety_index_test.rb
@@ -1,4 +1,4 @@
-$:.unshift('.')
+#$:.unshift('.')
 require 'monitor'
 require File.dirname(__FILE__) + "/../test_helper"
 require File.dirname(__FILE__) + "/number_to_spoken.rb"