usa	2008-10-03 14:04:57 +0900 (Fri, 03 Oct 2008)

  New Revision: 19664

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19664

  Log:
    * win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
      configure option support.

  Modified files:
    trunk/ChangeLog
    trunk/win32/Makefile.sub
    trunk/win32/configure.bat
    trunk/win32/setup.mak

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19663)
+++ ChangeLog	(revision 19664)
@@ -1,3 +1,8 @@
+Fri Oct  3 14:04:05 2008  NAKAMURA Usaku  <usa@r...>
+
+	* win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
+	  configure option support.
+
 Thu Oct  2 21:22:43 2008  Takeyuki FUJIOKA  <xibbar@r...>
 
 	* lib/cgi/core.rb (CGI::QueryExtension): delete MorphingBody
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 19663)
+++ win32/Makefile.sub	(revision 19664)
@@ -31,7 +31,7 @@
 srcdir = ..
 !endif
 !ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby$(RUBY_SUFFIX)
+RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)ruby$(RUBY_SUFFIX)
 !endif
 !if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
@@ -543,7 +543,7 @@
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
 s,@prefix@,$(prefix),;t t
-s,@program_transform_name@,s,$$,$(RUBY_SUFFIX),,;t t
+s,@program_transform_name@,s,.*,$(RUBY_PREFIX)&$(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
Index: win32/configure.bat
===================================================================
--- win32/configure.bat	(revision 19663)
+++ win32/configure.bat	(revision 19664)
@@ -18,6 +18,7 @@
 if "%1" == "--target" goto :target
 if "%1" == "target" goto :target
 if "%1" == "--with-static-linked-ext" goto :extstatic
+if "%1" == "--program-prefix" goto :pprefix
 if "%1" == "--program-suffix" goto :suffix
 if "%1" == "--program-name" goto :installname
 if "%1" == "--install-name" goto :installname
@@ -44,6 +45,12 @@
   shift
   shift
 goto :loop
+:pprefix
+  echo>> ~tmp~.mak 	"RUBY_PREFIX=%2" \
+  echo>>confargs.tmp %1=%2 \
+  shift
+  shift
+goto :loop
 :suffix
   echo>> ~tmp~.mak 	"RUBY_SUFFIX=%2" \
   echo>>confargs.tmp %1=%2 \
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 19663)
+++ win32/setup.mak	(revision 19664)
@@ -154,6 +154,9 @@
 
 -program-name-:
 	@type << >>$(MAKEFILE)
+!ifdef RUBY_PREFIX
+RUBY_PREFIX = $(RUBY_PREFIX)
+!endif
 !ifdef RUBY_SUFFIX
 RUBY_SUFFIX = $(RUBY_SUFFIX)
 !endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/