diff --git a/configure.ac b/configure.ac index 2dc4bd1..025c865 100644 --- a/configure.ac +++ b/configure.ac @@ -338,10 +338,12 @@ if test "${enable_ruby}" != "no"; then if test "${RUBY}" != "no"; then RUBY_ARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@'` RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitearchdir"@:>@'` + RUBY_SITELIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"sitelibdir"@:>@'` RUBY_LIBDIR=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@'` RUBY_SO_NAME=`ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@'` AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) + AC_SUBST(RUBY_SITELIBDIR) AC_SUBST(RUBY_LIBDIR) AC_SUBST(RUBY_SO_NAME) AC_CHECK_HEADERS($RUBY_ARCHDIR/ruby.h, [ac_cv_my_have_ruby="yes"]) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index 0af3c9a..002e725 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -1,8 +1,10 @@ # $Id: $ rubylibdir=$(RUBY_SITEARCHDIR) +rubysitedir=$(RUBY_SITELIBDIR) if USE_RUBY rubylib_LTLIBRARIES = caca.la cucul.la +rubysite_DATA = lib/caca.rb TESTS = test endif diff --git a/ruby/test b/ruby/test index 58f52b8..0fbd4ee 100755 --- a/ruby/test +++ b/ruby/test @@ -1,4 +1,4 @@ -#!/usr/bin/ruby -I.libs +#!/usr/bin/ruby -Ilib -I.libs require 'test/unit' Dir.glob("t/tc*.rb").each{ |t|