From: Brian West Date: Mon, 7 Apr 2014 20:26:13 +0000 (-0500) Subject: ESL-89: fix install path and single_command require X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=442526503832120d2eada4a8332d3be2de28a2b7;p=thirdparty%2Ffreeswitch.git 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 4ae6c357c1..8284dcda62 100644 --- 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 b763cd8211..fd52cb3511 100644 --- 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(" ")