Changeset: dec9f780e76d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dec9f780e76d
Modified Files:
configure.ag
Branch: Oct2014
Log Message:
When Ruby's sitelibdir is not inside its own or our prefix, append it.
This has an effect on Darwin where Ruby's prefix is
"/System/Library/Frameworks/Ruby.framework/Versions/2.0/usr" but its
sitelibdir is "/Library/Ruby/Site/2.0.0". So we install our gems in
"$prefix/Library/Ruby/Site/2.0.0" now instead of in
"/Library/Ruby/Site/2.0.0".
This fixes bug 3678.
diffs (23 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1449,8 +1449,8 @@ case "$have_rubygem_dir" in
yes|auto)
AC_MSG_CHECKING([where rubygems are
stored])
RUBY_DIR=
- d=`$RUBY -rrbconfig -e "puts
Config::CONFIG[['prefix']]" 2>/dev/null`
- RUBY_DIR=`$RUBY -rrbconfig -e "puts
Config::CONFIG[['sitelibdir']]" 2>/dev/null | sed -e "s|^$d/||" -e
's/site_ruby/gems/'`
+ d=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG[['prefix']]" 2>/dev/null`
+ RUBY_DIR=`$RUBY -rrbconfig -e "puts
RbConfig::CONFIG[['sitelibdir']]" 2>/dev/null | sed -e "s|^$d/||" -e
's/site_ruby/gems/'`
if test x"$RUBY_DIR" = x ; then
if test x"$have_rubygem_dir" !=
xauto; then
AC_MSG_ERROR([unable to
determine rubygems location])
@@ -1475,7 +1475,7 @@ esac
case "$RUBY_DIR" in
${prefix}/*)
RUBY_DIR="\${prefix}`echo "$RUBY_DIR" | sed "s|^$prefix||"`";;
-/*) ;;
+/*) RUBY_DIR="\${prefix}$RUBY_DIR";;
*)
RUBY_DIR="\${prefix}/$RUBY_DIR";;
esac
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
