From 053140491c5594ee81064ef3dc19d32b3e907794 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 19 Sep 2000 07:01:54 +0000
Subject: [PATCH] eban

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 3 ++-
 configure.in    | 2 +-
 win32/setup.mak | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22190adf2c..29dcb9c0f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@ Mon Sep 18 17:46:11 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Sep 19 14:01:01 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
-	* configure.in: include version number in RUBY_SO_NAME.
+	* configure.in, win32/setup.mak: include version number
+	  in RUBY_SO_NAME.
 
 Tue Sep 19 01:14:56 2000  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/configure.in b/configure.in
index 055f42229e..f0ed110889 100644
--- a/configure.in
+++ b/configure.in
@@ -849,7 +849,7 @@ case "$target_os" in
 	esac
 	;;
     cygwin*|mingw*)
-	RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'-${MAJOR}.${MINOR}
+	RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
 	if test x"$enable_shared" = xyes; then
 	    LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
 	    LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
diff --git a/win32/setup.mak b/win32/setup.mak
index f933332997..6bca4419b1 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -18,7 +18,7 @@ Makefile:
 	@echo ### makefile for ruby $(OS) ###> $@
 	@echo srcdir = $(srcdir:\=/)>> $@
 	@echo RUBY_INSTALL_NAME = ruby>> $@
-	@echo RUBY_SO_NAME = $$(RUBY_INSTALL_NAME).$(OS)>> $@
+	@echo RUBY_SO_NAME = $(OS)-$$(RUBY_INSTALL_NAME)16>> $@
 	@echo !INCLUDE $$(srcdir)/win32/Makefile.sub>> $@
 
 config.h config.status: $(srcdir)/win32/$$@.in