Support new RubyGems lib location.

Author: headius

Makefile

@@ -1,7 +1,8 @@
 # These line gets substituted with the actual Config::CONFIG items location by extconf.rb
 PREFIX = notspecified
 BINDIR = $(PREFIX)/bin
-SITELIBDIR = $(PREFIX)/lib/ruby/site_ruby/1.8
+INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
+OLDINSTALLDIR = $(PREFIX)/lib/ruby/site_ruby/1.8/rubygems/defaults
 
 ifeq (true,$(shell test -x $(BINDIR)/jruby && echo true))
 RAKE=$(BINDIR)/jruby -S rake
@@ -37,9 +38,18 @@ install:
 	@if [ ! -w $(BINDIR) ]; then echo "'$(BINDIR)' does not exist or cannot write to '$(BINDIR)'."; exit 1; fi
 	@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
 	cp ./jruby $(BINDIR)/jruby
-	@if [ x$(SITELIBDIR) = xnotspecified/lib/ruby/site_ruby/1.8 ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
-	@if [ ! -w $(SITELIBDIR) ]; then echo "'$(SITELIBDIR)' does not exist or cannot write to '$(SITELIBDIR)'."; exit 1; fi
-	cp ./lib/rubygems/defaults/jruby_native.rb $(SITELIBDIR)/rubygems/defaults
+	@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
+	@if [ ! -w $(INSTALLDIR) ]; then \
+		if [ ! -w $(OLDINSTALLDIR) ]; then \
+			echo "Neither '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
+		else \
+			echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
+			cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
+		fi; \
+	else \
+		echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
+		cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
+	fi;
 
 test:
 	$(RAKE)

extconf.rb

@@ -2,5 +2,6 @@
 
 mf = File.read('Makefile')
 mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
-mf = mf.gsub(/^SITELIBDIR\s*=.*$/, "SITELIBDIR = #{Config::CONFIG['sitelibdir']}")
+mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
+puts mf
 File.open('Makefile', 'wb') {|f| f << mf}

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end