merges r29298 from trunk into ruby_1_9_2.

--
* configure.in (LIBRUBY_SO): fix an oversight of replace
  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
  at [ruby-core:32474].

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

3 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e60618ba89..8399064b38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Sep 19 13:44:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (LIBRUBY_SO): fix an oversight of replace
+	  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
+	  at [ruby-core:32474].
+
 Sun Aug 29 12:19:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* load.c (load_failed): should honor encoding.  [ruby-core:31915]
diff --git a/configure.in b/configure.in
index a978c97750..61f5aa0442 100644
--- a/configure.in
+++ b/configure.in
@@ -2119,7 +2119,7 @@ if test "$enable_shared" = 'yes'; then
 	],
     [openbsd*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
 	],
     [solaris*], [
 	SOLIBS='$(LIBS)'
diff --git a/version.h b/version.h
index 182d2f3539..f51b1c350d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 16
+#define RUBY_PATCHLEVEL 17
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1