rails_generator.rb in rails-2.3.6

- old
+ new

@@ -19,11 +19,14 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
+railties = File.expand_path("..", __FILE__)
+$:.unshift(railties) unless $:.include?(railties)
+
+activesupport = File.expand_path("../../../activesupport/lib", __FILE__)
+$:.unshift(activesupport) unless $:.include?(activesupport)
 
 begin
   require 'active_support'  
 rescue LoadError
   require 'rubygems'