From f7c45562530faa69a05fceabdab26984011d06a6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 8 Sep 2006 00:00:12 +0000
Subject: * win32/Makefile.sub, win32/configure.bat win32/setup.mak: program  
 name transform.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  5 +++++
 win32/Makefile.sub  |  4 ++--
 win32/configure.bat |  4 +++-
 win32/setup.mak     | 15 ++++++++++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d63f2618c..add91638fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  8 08:59:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
+	  name transform.
+
 Fri Sep  8 01:33:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ruby.h (RSTRING_PTR): add migration macro.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index db737332c2..23c73be382 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -11,7 +11,7 @@ NULL = nul
 srcdir = ..
 !endif
 !ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby
+RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
 !endif
 !if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
@@ -327,7 +327,7 @@ s,@LDFLAGS@,,;t t
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
 s,@prefix@,,;t t
-s,@program_transform_name@,s,,,,;t t
+s,@program_transform_name@,s,$$,$(RUBY_SUFFIX),,;t t
 s,@bindir@,$${exec_prefix}/bin,;t t
 s,@sbindir@,$${exec_prefix}/sbin,;t t
 s,@libexecdir@,$${exec_prefix}/libexec,;t t
diff --git a/win32/configure.bat b/win32/configure.bat
index b36024371c..f4f24a5ed7 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -18,7 +18,9 @@ if "%1" == "target" goto :target
 if "%1" == "--with-static-linked-ext" goto :extstatic
 if "%1" == "--with-winsock2" goto :winsock2
 if "%1" == "--program-suffix" goto :suffix
-if "%1" == "--program-name" goto :progname
+if "%1" == "--program-name" goto :installname
+if "%1" == "--install-name" goto :installname
+if "%1" == "--so-name" goto :soname
 if "%1" == "--enable-install-doc" goto :enable-rdoc
 if "%1" == "--disable-install-doc" goto :disable-rdoc
 if "%1" == "--extout" goto :extout
diff --git a/win32/setup.mak b/win32/setup.mak
index da7853bb20..f06805e55f 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -32,7 +32,7 @@ i586-$(OS): -prologue- -i586- -epilogue-
 i686-$(OS): -prologue- -i686- -epilogue-
 alpha-$(OS): -prologue- -alpha- -epilogue-
 
--prologue-: -basic-vars- -system-vars- -version-
+-prologue-: -basic-vars- -system-vars- -version- -program-name-
 
 -basic-vars-: nul
 	@type << > $(MAKEFILE)
@@ -123,6 +123,19 @@ TEENY = RUBY_VERSION_TEENY
 MSC_VER = _MSC_VER
 <<
 
+-program-name-:
+	@type << >>$(MAKEFILE)
+!ifdef RUBY_SUFFIX
+RUBY_SUFFIX = $(RUBY_SUFFIX)
+!endif
+!ifdef RUBY_INSTALL_NAME
+RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)
+!endif
+!ifdef RUBY_SO_NAME
+RUBY_SO_NAME = $(RUBY_SO_NAME)
+!endif
+<<
+
 -generic-: nul
 !if defined($(ARCH)) || defined($(CPU))
 	@type << >>$(MAKEFILE)
-- 
cgit v1.2.3