You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2010/05/12 23:31:58 UTC
svn commit: r943698 - in /incubator/thrift/trunk: configure.ac
lib/rb/Makefile.am
Author: bryanduxbury
Date: Wed May 12 21:31:58 2010
New Revision: 943698
URL: http://svn.apache.org/viewvc?rev=943698&view=rev
Log:
THRIFT-459. Ruby installation always tries to write to /Library/Ruby/site
This patch adds a RUBY_PREFIX option similiar to JAVA_PREFIX or PY_PREFIX.
Patch: Matthieu Imbert
Modified:
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/rb/Makefile.am
Modified: incubator/thrift/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=943698&r1=943697&r2=943698&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Wed May 12 21:31:58 2010
@@ -37,6 +37,11 @@ AC_ARG_VAR([JAVA_PREFIX], [Prefix for in
Default = "/usr/local/lib"])
AS_IF([test "x$JAVA_PREFIX" = x], [JAVA_PREFIX="/usr/local/lib"])
+AC_ARG_VAR([RUBY_PREFIX], [Prefix for installing Ruby modules.
+ (Normal --prefix is ignored for Ruby because
+ Ruby has different conventions.)
+ Default = none, let ruby setup decide])
+
AC_ARG_VAR([PHP_PREFIX], [Prefix for installing PHP modules.
(Normal --prefix is ignored for PHP because
PHP has different conventions.)
Modified: incubator/thrift/trunk/lib/rb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/rb/Makefile.am?rev=943698&r1=943697&r2=943698&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/rb/Makefile.am (original)
+++ incubator/thrift/trunk/lib/rb/Makefile.am Wed May 12 21:31:58 2010
@@ -29,7 +29,7 @@ EXTRA_DIST = \
spec
all-local:
- $(RUBY) setup.rb config
+ if [ -n "$(RUBY_PREFIX)" ] ; then $(RUBY) setup.rb config --prefix=$(DESTDIR)$(RUBY_PREFIX) --rbdir='$$libdir/ruby' --sodir='$$libdir/ruby' ; elif [ -n "$(DESTDIR)" ] ; then $(RUBY) setup.rb config --prefix=$(DESTDIR) ; else $(RUBY) setup.rb config ; fi
$(RUBY) setup.rb setup
install-exec-hook: