summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 06:49:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-14 06:49:08 +0000
commit7be768625f505ae6b4c7b0a43a8396054a1244c7 (patch)
tree8b54fcaf1c9eb1839f6866a7fc1cbf6617b4c82f
parent07504c78556e13a96857eef4038578895b9d54b0 (diff)
downloadruby-7be768625f505ae6b4c7b0a43a8396054a1244c7.tar.gz
ruby-7be768625f505ae6b4c7b0a43a8396054a1244c7.tar.xz
ruby-7be768625f505ae6b4c7b0a43a8396054a1244c7.zip
* configure.in (RUBY_LIB_PREFIX): use libdir.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a4c45921c..34864bcda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 14 15:49:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_LIB_PREFIX): use libdir.
+
Fri Mar 14 14:24:15 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/defs.h: inttypes.h is still needed.
diff --git a/configure.in b/configure.in
index 16066f3e2..d99cca9ee 100644
--- a/configure.in
+++ b/configure.in
@@ -1716,10 +1716,10 @@ case "$target_os" in
esac
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
- RUBY_LIB_PREFIX="/lib/ruby"
+ RUBY_LIB_PREFIX="`expr "$libdir" : "$prefix\(/.*\)"`/ruby"
;;
*)
- RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+ RUBY_LIB_PREFIX="${libdir}/ruby"
;;
esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}.${TEENY}"
@@ -1727,7 +1727,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}.${TEENY}"
AC_ARG_WITH(sitedir,
[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval],
- [sitedir='${prefix}/lib/ruby/site_ruby'])
+ [sitedir='${libdir}/ruby/site_ruby'])
SITE_DIR=`eval echo \\"${sitedir}\\"`
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)