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 2011/06/15 22:34:53 UTC

svn commit: r1136180 - /thrift/trunk/lib/rb/Makefile.am

Author: bryanduxbury
Date: Wed Jun 15 20:34:53 2011
New Revision: 1136180

URL: http://svn.apache.org/viewvc?rev=1136180&view=rev
Log:
THRIFT-1207. rb: Support DESTDIR on 'make install' of ruby libs

Patch: Brandon Philips

Modified:
    thrift/trunk/lib/rb/Makefile.am

Modified: thrift/trunk/lib/rb/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/rb/Makefile.am?rev=1136180&r1=1136179&r2=1136180&view=diff
==============================================================================
--- thrift/trunk/lib/rb/Makefile.am (original)
+++ thrift/trunk/lib/rb/Makefile.am Wed Jun 15 20:34:53 2011
@@ -28,12 +28,14 @@ EXTRA_DIST = \
 	script \
 	spec
 
+DESTDIR ?= /
+
 all-local:
 	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:
-	$(RUBY) setup.rb install
+	$(RUBY) setup.rb install --prefix=$(DESTDIR)
 
 # Make sure this doesn't fail if Ruby is not configured.
 clean-local: