diff --git a/configure.ac b/configure.ac index 630ea32..d3b4894 100644 --- a/configure.ac +++ b/configure.ac @@ -398,12 +398,12 @@ if test "${enable_ruby}" != "no"; then if test "${RUBY}" != "no"; then RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')" RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')" - RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitearchdir"@:>@'` - RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitelibdir"@:>@'` + RUBY_VENDORARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorarchdir"@:>@'` + RUBY_VENDORLIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"vendorlibdir"@:>@'` AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_LIBS) - AC_SUBST(RUBY_SITEARCHDIR) - AC_SUBST(RUBY_SITELIBDIR) + AC_SUBST(RUBY_VENDORARCHDIR) + AC_SUBST(RUBY_VENDORLIBDIR) CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}" AC_CHECK_HEADERS([ruby.h], [ac_cv_my_have_ruby="yes" diff --git a/ruby/Makefile.am b/ruby/Makefile.am index d4f226b..1dd2b41 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -1,11 +1,11 @@ # $Id: $ -rubylibdir = $(RUBY_SITEARCHDIR) -rubysitedir = $(RUBY_SITELIBDIR) +rubylibdir = $(RUBY_VENDORARCHDIR) +rubyvendordir = $(RUBY_VENDORLIBDIR) if USE_RUBY rubylib_LTLIBRARIES = caca.la -rubysite_DATA = lib/caca.rb +rubyvendor_DATA = lib/caca.rb TESTS = test endif