ESL-89: fix install path and single_command require

Conflicts:
	libs/esl/ruby/single_command.rb

diff --git a/libs/esl/ruby/Makefile b/libs/esl/ruby/Makefile
index 4ae6c357c19c1413b49d6fc399639a56c6360934..8284dcda62cc1d5340c206002508331fb29c5870 100644 (file)
--- a/libs/esl/ruby/Makefile
+++ b/libs/esl/ruby/Makefile
@@ -1,7 +1,7 @@
 RUBY:=ruby
 LOCAL_LDFLAGS=$(shell $(RUBY) -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBYARG"]')
 LOCAL_CFLAGS=$(shell $(RUBY) cflags.rb)
-RUBY_GEM_DIR=$(shell $(RUBY) -e 'puts Gem.dir')
+RUBY_GEM_DIR=$(shell $(RUBY) -e 'puts RbConfig::CONFIG["rubylibdir"]')
 
 all: ESL.so
 

diff --git a/libs/esl/ruby/single_command.rb b/libs/esl/ruby/single_command.rb
index b763cd8211b305c0d98586db2bfc285c881b6d0f..fd52cb35113faec51d7157a5176a30086834b0a7 100644 (file)
--- a/libs/esl/ruby/single_command.rb
+++ b/libs/esl/ruby/single_command.rb
@@ -1,5 +1,4 @@
 #! /usr/bin/ruby
-
 require "ESL"
 
 command = ARGV.join(" ")