merge revision(s) 50416: [Backport #11111]

	dln.c: fix EXTERNAL_PREFIX

	* configure.in (EXPORT_PREFIX): revert r50410.

	* dln.c (EXTERNAL_PREFIX): define by predefined macros.
  configured EXPORT_PREFIX is different thing.

	* win32/Makefile.sub: r50414-50415.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index 1d5d988077..e501df92e9 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-11"
-#define RUBY_PATCHLEVEL 341
+#define RUBY_PATCHLEVEL 342
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5