diff -ur allinoneruby-0.2.4.tar.gz/allinoneruby/CHANGELOG allinoneruby-0.2.5.tar.gz/allinoneruby/CHANGELOG
--- allinoneruby-0.2.4.tar.gz/allinoneruby/CHANGELOG	2005-06-14 21:41:39.000000000 +0200
+++ allinoneruby-0.2.5.tar.gz/allinoneruby/CHANGELOG	2005-06-21 00:02:16.000000000 +0200
@@ -1,5 +1,11 @@
 ----------------------------------------------------------------
 
+0.2.5 - 21.06.2005
+
+* Fixed a bug concerning --site handling.
+
+----------------------------------------------------------------
+
 0.2.4 - 14.06.2005
 
 * Fixed a bug concerning spaces in %TEMP%.
diff -ur allinoneruby-0.2.4.tar.gz/allinoneruby/init.rb allinoneruby-0.2.5.tar.gz/allinoneruby/init.rb
--- allinoneruby-0.2.4.tar.gz/allinoneruby/init.rb	2005-06-03 13:17:15.000000000 +0200
+++ allinoneruby-0.2.5.tar.gz/allinoneruby/init.rb	2005-06-18 12:17:20.000000000 +0200
@@ -37,6 +37,7 @@
     tofile	= File.expand_path(File.basename(fromfile), dest)
 
     $stderr.puts "Copying #{fromfile} ..."	if VERBOSE
+
     File.copy(fromfile, tofile)			unless File.file?(tofile)
   end
 end
@@ -60,10 +61,11 @@
 
 bindir1		= Config::CONFIG["bindir"]
 libdir1		= Config::CONFIG["libdir"]
+sitedir1	= Config::CONFIG["sitedir"]
 bindir2		= tmplocation("bin/")
 libdir2		= tmplocation("lib/")
-rubylibdir1	= Config::CONFIG["rubylibdir"]
-sitelibdir1	= Config::CONFIG["sitelibdir"]
+
+numberoflibs	= 0
 
 Dir.mkdir(bindir2)	unless File.directory?(bindir2)
 Dir.mkdir(libdir2)	unless File.directory?(libdir2)
@@ -78,21 +80,17 @@
 $stderr.puts "Copying files..."	unless QUIET
 
 begin
-  file	= rubylibdir1[libdir1.length..-1].gsub(/^[\/\\]*/, "")
-  s1	= rubylibdir1
-  s2	= File.expand_path(file, libdir2)
-
-  $stderr.puts "Copying #{s1}/ ..."	if VERBOSE
-  Dir.copy(s1, s2)	unless File.directory?(s2)
-end
+  $:.each do |dir|
+    if (dir.include?(libdir1) and not dir.include?(sitedir1)) or (site and dir.include?(sitedir1))
+      numberoflibs += 1
+      s1	= dir
+      s2	= File.expand_path("lib#{numberoflibs}", libdir2)
 
-if site
-  file	= sitelibdir1[libdir1.length..-1].gsub(/^[\/\\]*/, "")
-  s1	= sitelibdir1
-  s2	= File.expand_path(file, libdir2)
+      $stderr.puts "Copying #{s1}/ ..."	if VERBOSE
 
-  $stderr.puts "Copying #{s1}/ ..."	if VERBOSE
-  Dir.copy(s1, s2)	unless File.directory?(s2)
+      Dir.copy(s1, s2)	unless File.directory?(s2)
+    end
+  end
 end
 
 copyto(rubyexe, bindir2)	if linux? or darwin?	if File.file?(rubyexe)
@@ -130,9 +128,11 @@
   f.puts "lib	= File.expand_path(File.dirname(__FILE__)) + ´/lib´"
   f.puts "lib.sub!(/^.:/, ´/cygdrive/%s´ % $&[0..0].downcase)	if lib =~ /^.:/"	if cygwin?
   f.puts "$:.clear"
-  $:.each do |s|
-    f.puts "$: << \"%s\"" % s.sub(libdir1, ´#{lib}´)	unless s.include?(newlocation)
+
+  numberoflibs.times do |n|
+    f.puts "$: << lib + ´/lib%s´" % [n+1]
   end
+  f.puts "$: << ´.´"
 
   f.puts "# Load eee.info"
 
diff -ur allinoneruby-0.2.4.tar.gz/allinoneruby/VERSION allinoneruby-0.2.5.tar.gz/allinoneruby/VERSION
--- allinoneruby-0.2.4.tar.gz/allinoneruby/VERSION	2005-06-14 21:42:38.000000000 +0200
+++ allinoneruby-0.2.5.tar.gz/allinoneruby/VERSION	2005-06-21 00:02:54.000000000 +0200
@@ -1 +1 @@
-0.2.4
+0.2.5