Merge pull request #49 from headius/skinny_fixes

Additional fixes and tweaks for the skinny launcher

Author: headius

Makefile

@@ -3,9 +3,6 @@ PREFIX = notspecified
 BINDIR = $(PREFIX)/bin
 JRUBY_VERSION = notspecified
 JRUBY_MODULE = 1
-INSTALLDIR = $(PREFIX)/lib/ruby/shared/rubygems/defaults
-INSTALLDIR9000 = $(PREFIX)/lib/ruby/stdlib/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
@@ -42,22 +39,7 @@ install:
 	@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
 	cp ./jruby $(BINDIR)/jruby
 	@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 \
-			if [ ! -w $(INSTALLDIR9000) ]; then \
-				echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
-			else \
-				echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
-				cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
-			fi; \
-		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;
+	@if [ ! -f $(BINDIR)/jruby.sh ]; then cp ./exe/jruby.sh $(BINDIR)/jruby.sh; fi
 
 test:
 	$(RAKE)

Rakefile

@@ -26,7 +26,7 @@ task :gemspec => './lib/jruby-launcher.rb' do
     s.summary = %q{Native launcher for JRuby}
     s.email = ["nick@nicksieger.com", "vsizikov@gmail.com"]
     s.extensions = ["extconf.rb"]
-    s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*"]
+    s.files = FileList["COPYING", "README.md", "Makefile", "Rakefile", "*.c", "*.cpp", "*.h", "inc/*.*", "**/*.rb", "resources/*.*", "exe/jruby.sh"]
     s.homepage = %q{http://jruby.org}
   end
 end