ESL-89: --resolve add rubymod-install and add ability to use a ruby not in your path...

Conflicts:
	libs/esl/Makefile.am

diff --git a/libs/esl/Makefile b/libs/esl/Makefile
index 3e59a9dc0ce859f34bbc810a5ea236e19d725b16..af8aecdb8b034cd58161ad7c57fe0fa63698ff5a 100644 (file)
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@@ -105,4 +105,7 @@ phpmod-install: phpmod
 pymod-install: pymod
        $(MAKE) -C python install
 
+rubymod-install: rubymod
+       $(MAKE) -C ruby install
+
 everymod: perlmod phpmod luamod pymod rubymod javamod managedmod

diff --git a/libs/esl/ruby/Makefile b/libs/esl/ruby/Makefile
index 21ed211a4482d7ef36017805ff2fdef412497b7d..4ae6c357c19c1413b49d6fc399639a56c6360934 100644 (file)
--- a/libs/esl/ruby/Makefile
+++ b/libs/esl/ruby/Makefile
@@ -1,5 +1,7 @@
-LOCAL_LDFLAGS=$(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["LIBRUBYARG"]')
-LOCAL_CFLAGS=$(shell ruby cflags.rb)
+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')
 
 all: ESL.so
 
@@ -12,6 +14,10 @@ esl_wrap.o: esl_wrap.cpp
 ESL.so: esl_wrap.o
        $(CXX) $(SOLINK) esl_wrap.o $(MYLIB) $(LOCAL_LDFLAGS) -o ESL.so -L. $(LIBS)
 
+
+install: ESL.so
+       install -m 755 ESL.so $(RUBY_GEM_DIR)
+
 clean:
        rm -f *.o *.so *~
 

diff --git a/libs/esl/ruby/cflags.rb b/libs/esl/ruby/cflags.rb
index 45c10b1727b4ca27bcdc8e3c21551fa509073f42..5a269c94686137522f100648690841ceb0a50c7b 100644 (file)
--- a/libs/esl/ruby/cflags.rb
+++ b/libs/esl/ruby/cflags.rb
@@ -3,6 +3,6 @@ require 'rbconfig'
 cflags = if RUBY_VERSION =~ /1.9/ then
   "-I#{RbConfig::CONFIG['rubyhdrdir']} -I#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']}"
 else
-  "-I#{RbConfig::CONFIG["topdir"]}"
+  "-I#{RbConfig::CONFIG["topdir"]} -I#{RbConfig::CONFIG['rubyhdrdir']} -I#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']}"
 end
-puts cflags
\ No newline at end of file
+puts cflags