summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-12 02:42:51 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-12 02:42:51 +0000
commit33c7e324e50ef3053449ddd0719e95e3182098b4 (patch)
tree1cf42863d03a41a534bf4c4aeaca40c228742fbe
parent5e4de2a2656607feaa38aedfbaf705d1a9a8c6a6 (diff)
* configure.in: Desbribe "no" configure option for site_ruby
and vendor_ruby. Patch by Vit Ondruch. [Bug #5187][ruby-core:38921] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ac034780c..0232b3cb75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 12 11:39:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * configure.in: Desbribe "no" configure option for site_ruby
+ and vendor_ruby. Patch by Vit Ondruch. [Bug #5187][ruby-core:38921]
+
Fri Aug 12 09:00:24 2011 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Import RubyGems 1.8.8. Fixes encoding of YAML gemspec
diff --git a/configure.in b/configure.in
index 8140a15c0a..49969c6e15 100644
--- a/configure.in
+++ b/configure.in
@@ -2776,7 +2776,7 @@ else
fi
AC_ARG_WITH(sitedir,
- AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
+ AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]]),
[sitedir=$withval],
[sitedir='${rubylibprefix}/site_ruby'])
dir="${sitedir}"
@@ -2785,7 +2785,7 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
done
AC_ARG_WITH(vendordir,
- AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
+ AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
[vendordir=$withval],
[vendordir='${rubylibprefix}/vendor_ruby'])
dir="${vendordir}"