summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-08 00:00:12 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-08 00:00:12 +0000
commiteba74dc219404e746f5e9273794e27c71be003db (patch)
tree4943f6c9ea2279d808705c7c7664c00aa4c02467
parent58b0275a4c337c78cdec47575489fb5f808ba065 (diff)
* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
name transform. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/Makefile.sub4
-rwxr-xr-xwin32/configure.bat4
-rw-r--r--win32/setup.mak15
4 files changed, 24 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index efc9174d512..525173db411 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 08:25:39 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb: suppress `assigning void value' warning.
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 9a361d482c0..4fa86903f99 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -17,7 +17,7 @@ LIB = $(pathlist:;=/lib;)
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)
@@ -361,7 +361,7 @@ s,@LDFLAGS@,,;t t
s,@LIBS@,$(LIBS),;t t
s,@exec_prefix@,$${prefix},;t t
s,@prefix@,$(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 52cf8d7090a..5f5420f520c 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -19,7 +19,9 @@ if "%1" == "--target" goto :target
if "%1" == "target" goto :target
if "%1" == "--with-static-linked-ext" goto :extstatic
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 e066805bd52..e4f874434a1 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)
@@ -120,6 +120,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)