[jruby~main:b600c9ef] Force install location to 1.8 dir.

[nicksieger@kenai.com]

Project:    jruby
Repository: main
Revision:   b600c9ef17dedb8628346755e1ff6c8c9557b8c3
Author:     nicksieger
Date:       2010-03-12 06:44:33 UTC
Link:       

Log Message:
------------
Fix empty package naming for jrubyc --java
Force install location to 1.8 dir.


Revisions:
----------
702de12b1511816b4b3820aa42e6f329b0c9a7c2
b600c9ef17dedb8628346755e1ff6c8c9557b8c3


Modified Paths:
---------------
lib/ruby/site_ruby/shared/jruby/compiler.rb
lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb


Diffs:
------
diff --git a/lib/ruby/site_ruby/shared/jruby/compiler.rb 
b/lib/ruby/site_ruby/shared/jruby/compiler.rb
index 45bcdb3..2cb0a6e 100644
--- a/lib/ruby/site_ruby/shared/jruby/compiler.rb
+++ b/lib/ruby/site_ruby/shared/jruby/compiler.rb
@@ -247,7 +247,11 @@ JAVA
     end
 
     def package_string
-      "package #{package};"
+      if package.empty?
+        ""
+      else
+        "package #{package};"
+      end
     end
 
     def to_s
diff --git a/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb 
b/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
index 62aa245..f0e32cc 100644
--- a/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
+++ b/lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb
@@ -49,7 +49,7 @@ module Gem
   # JRuby: We don't want gems installed in lib/jruby/gems, but rather
   # to preserve the old location: lib/ruby/gems.
   def self.default_dir
-    File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
+    File.join ConfigMap[:libdir], 'ruby', 'gems', '1.8'
   end
 
   ##