File tree Expand file tree Collapse file tree 3 files changed +9
-3
lines changed Expand file tree Collapse file tree 3 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 22PREFIX = notspecified
33BINDIR = $(PREFIX ) /bin
44INSTALLDIR = $(PREFIX ) /lib/ruby/shared/rubygems/defaults
5+ INSTALLDIR9000 = $(PREFIX ) /lib/ruby/stdlib/rubygems/defaults
56OLDINSTALLDIR = $(PREFIX ) /lib/ruby/site_ruby/1.8/rubygems/defaults
67
78ifeq (true,$(shell test -x $(BINDIR ) /jruby && echo true) )
@@ -41,7 +42,12 @@ install:
4142 @if [ x$( PREFIX) = xnotspecified ]; then echo " Please define where to install by passing PREFIX=<jruby-home>." ; exit 1; fi
4243 @if [ ! -w $( INSTALLDIR) ]; then \
4344 if [ ! -w $( OLDINSTALLDIR) ]; then \
44- echo " Neither '$( INSTALLDIR) ' nor '$( OLDINSTALLDIR) ' exist and are writable" ; exit 1; \
45+ if [ ! -w $( INSTALLDIR9000) ]; then \
46+ echo " Neither '$( INSTALLDIR9000) ' nor '$( INSTALLDIR) ' nor '$( OLDINSTALLDIR) ' exist and are writable" ; exit 1; \
47+ else \
48+ echo " cp ./lib/rubygems/defaults/jruby_native.rb $( INSTALLDIR9000) " ; \
49+ cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000 ) ; \
50+ fi ; \
4551 else \
4652 echo " cp ./lib/rubygems/defaults/jruby_native.rb $( OLDINSTALLDIR) " ; \
4753 cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR ) ; \
Original file line number Diff line number Diff line change 11module JRubyLauncher
2- VERSION = "1.1.0 "
2+ VERSION = "1.1.1 "
33end
Original file line number Diff line number Diff line change 66#ifndef _VERSION_H_
77#define _VERSION_H_
88
9- #define JRUBY_LAUNCHER_VERSION "1.1.0 "
9+ #define JRUBY_LAUNCHER_VERSION "1.1.1 "
1010
1111#endif // ! _VERSION_H_
You can’t perform that action at this time.
0 commit comments