Skip to content

Commit 2831371

Browse files
committed
Revert "Also remove copying logic for jruby-native.rb"
This reverts commit 378c026.
1 parent 7059e30 commit 2831371

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,22 @@ install:
4242
@if [ -f $(BINDIR)/jruby -a ! -w $(BINDIR)/jruby ]; then echo "Cannot write to '$(BINDIR)/jruby'."; exit 1; fi
4343
cp ./jruby $(BINDIR)/jruby
4444
@if [ x$(PREFIX) = xnotspecified ]; then echo "Please define where to install by passing PREFIX=<jruby-home>."; exit 1; fi
45+
@if [ ! -w $(INSTALLDIR) ]; then \
46+
if [ ! -w $(OLDINSTALLDIR) ]; then \
47+
if [ ! -w $(INSTALLDIR9000) ]; then \
48+
echo "Neither '$(INSTALLDIR9000)' nor '$(INSTALLDIR)' nor '$(OLDINSTALLDIR)' exist and are writable"; exit 1; \
49+
else \
50+
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000)"; \
51+
cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR9000); \
52+
fi; \
53+
else \
54+
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR)"; \
55+
cp ./lib/rubygems/defaults/jruby_native.rb $(OLDINSTALLDIR); \
56+
fi; \
57+
else \
58+
echo "cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR)"; \
59+
cp ./lib/rubygems/defaults/jruby_native.rb $(INSTALLDIR); \
60+
fi;
4561

4662
test:
4763
$(RAKE)

0 commit comments

Comments
 (0)