summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 13:15:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 13:15:04 +0000
commit8a3a464dcbd54e8d9d2e998e6faae9d37aff5081 (patch)
treed4efd62cf12bc696142416a02a44c8458e469e63
parent2f5aa44b8e0a5f41a1646a2124dbf732a1620297 (diff)
* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
SITE_DIR. a patch from Richard Brown <rbrown AT exherbo.org> in [ruby-core:17129]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 66d2ba810b..f089d3be10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 7 22:15:02 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
+ SITE_DIR. a patch from Richard Brown <rbrown AT exherbo.org> in
+ [ruby-core:17129].
+
Sat Jun 7 17:11:29 2008 Tanaka Akira <akr@fsij.org>
* gc.c (os_obj_of): assure to not free the scanning heap.
diff --git a/configure.in b/configure.in
index 405afb0502..5f4c104112 100644
--- a/configure.in
+++ b/configure.in
@@ -1698,7 +1698,7 @@ esac
RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
AC_ARG_WITH(sitedir,
- [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
+ [ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
[sitedir=$withval],
[sitedir='${libdir}/ruby/site_ruby'])
SITE_DIR=`eval echo \\"${sitedir}\\"`
@@ -1721,9 +1721,9 @@ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
AC_ARG_WITH(vendordir,
- [ --with-vendordir=DIR vendor libraries in DIR [PREFIX/lib/ruby/vendor_ruby]],
+ [ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
[vendordir=$withval],
- [vendordir='${prefix}/lib/ruby/vendor_ruby'])
+ [vendordir='${libdir}/ruby/vendor_ruby'])
VENDOR_DIR=`eval echo \\"${vendordir}\\"`
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)