diff -r 093306a32a73 -r ff3cbef81e88 make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Tue Nov 12 13:24:56 2013 -0700 +++ b/make-rules/shared-macros.mk Tue Nov 12 15:39:16 2013 -0800 @@ -277,13 +277,19 @@ CC = $(CC.$(COMPILER).$(BITS)) CXX = $(CXX.$(COMPILER).$(BITS)) -RUBY_VERSION = 1.8 -RUBY_LIB_VERSION = 1.8 +RUBY_VERSION = 1.9 +RUBY_LIB_VERSION = 1.9.1 RUBY.1.8 = /usr/ruby/1.8/bin/ruby RUBY.1.9 = /usr/ruby/1.9/bin/ruby -VENDOR_RUBY = /usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION) RUBY = $(RUBY.$(RUBY_VERSION)) +# Note: Ruby 1.9 is 64-bit only; there is no 32-bit ruby 1.9. +VENDOR_RUBY.32 = \ + /usr/ruby/$(RUBY_VERSION)/lib/ruby/vendor_ruby/$(RUBY_LIB_VERSION) +VENDOR_RUBY.64 = \ + /usr/ruby/$(RUBY_VERSION)/lib/$(MACH64)/ruby/vendor_ruby/$(RUBY_LIB_VERSION) +VENDOR_RUBY = $(VENDOR_RUBY.$(BITS)) + PYTHON_VENDOR_PACKAGES.32 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages PYTHON_VENDOR_PACKAGES.64 = /usr/lib/python$(PYTHON_VERSION)/vendor-packages/64 PYTHON_VENDOR_PACKAGES = $(PYTHON_VENDOR_PACKAGES.$(BITS))