merges r24536 from trunk into ruby_1_9_1.

--
* configure.in (rubyhdrdir): fixed typo.  [ruby-dev:39079]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e77dff079e..0084d7e4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug 14 14:31:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rubyhdrdir): fixed typo.  [ruby-dev:39079]
+
 Fri Aug 14 00:29:22 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* doc/ChangeLog-1.8.0: add forgotten entry contributed by
diff --git a/configure.in b/configure.in
index c98a024562..f49a88aea3 100644
--- a/configure.in
+++ b/configure.in
@@ -2089,7 +2089,7 @@ if test "$search_path" != ""; then
 fi
 
 AC_ARG_WITH(rubyhdrdir,
-	    [  --with-ruby-hdrdir=DIR  core headers in DIR [INCLUDEDIR]],
+	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
 	    [rubyhdrdir=$withval],
 	    [rubyhdrdir='${includedir}/${RUBY_INSTALL_NAME}-${ruby_version}'])
 
diff --git a/version.h b/version.h
index d60c23963a..7e2d5c7c77 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 289
+#define RUBY_PATCHLEVEL 290
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1