Changeset: 8a1be7a26624 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a1be7a26624
Modified Files:
buildtools/conf/MonetDB.m4
Branch: default
Log Message:
rubygems: fix install location
Don't install into local/... but in the location where all other gems
would be found. At the same time, fix some inefficiencies, and
fragilities.
diffs (43 lines):
diff -r 7fc8e11ca802 -r 8a1be7a26624 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Mon Jan 10 11:08:58 2011 +0100
+++ b/buildtools/conf/MonetDB.m4 Mon Jan 10 14:00:04 2011 +0100
@@ -1485,13 +1485,6 @@
have_rubygem_dir="$withval")
case "$have_rubygem_dir" in
- yes|no|auto) ;;
- *)
- RUBY_DIR="$have_rubygem_dir"
- ;;
- esac
-
- case "$have_rubygem_dir" in
yes|auto)
AC_PATH_PROG(RUBY,$RUBY,no,$PATH)
if test "x$RUBY" = xno; then
@@ -1500,15 +1493,20 @@
fi
have_rubygem_dir=no
else
- d=`which "$RUBY"`
- d=`dirname "$d"`
- d=`dirname "$d"`
- RUBY_DIR=`$RUBY -rubygems -e 'puts Gem::dir'
2>/dev/null | sed "s|^$d/||"`
+ 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/'`
+ if test x"$RUBY_DIR" = x ; then
+ AC_MSG_ERROR([unable to determine
rubygems location])
+ else
+ AC_MSG_RESULT([$RUBY_DIR])
+ fi
fi
;;
no) ;;
*)
- RUBY_DIR=$have_rubygem_dir
+ RUBY_DIR="$have_rubygem_dir"
;;
esac
AC_SUBST(RUBY_DIR)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
