usa	2010-12-16 19:55:11 +0900 (Thu, 16 Dec 2010)

  New Revision: 30225

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

  Log:
    * win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
      PROGRAM_SUFFIX): unite the differences of the names of macros of
      prefix and suffix.
      reported by HANEDA Norikatsu. [ruby-dev:42775]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30224)
+++ ChangeLog	(revision 30225)
@@ -1,3 +1,10 @@
+Thu Dec 16 19:50:12 2010  NAKAMURA Usaku  <usa@r...>
+
+	* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
+	  PROGRAM_SUFFIX): unite the differences of the names of macros of
+	  prefix and suffix.
+	  reported by HANEDA Norikatsu. [ruby-dev:42775]
+
 Thu Dec 16 08:04:47 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* node.h (RNode): match the type of flags to RBasic, and renamed
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 30224)
+++ win32/Makefile.sub	(revision 30225)
@@ -36,7 +36,7 @@
 RUBY_BASE_NAME = ruby
 !endif
 !ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)$(RUBY_BASE_NAME)$(RUBY_SUFFIX)
+RUBY_INSTALL_NAME = $(PROGRAM_PREFIX)$(RUBY_BASE_NAME)$(PROGRAM_SUFFIX)
 !endif
 !if !defined(RUBYW_INSTALL_NAME) || "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
 RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
@@ -689,7 +689,7 @@
 s,@LIBS@,$(LIBS),;t t
 s,@exec_prefix@,$${prefix},;t t
 s,@prefix@,$(prefix),;t t
-s,@program_transform_name@,s,.*,$(RUBY_PREFIX)&$(RUBY_SUFFIX),,;t t
+s,@program_transform_name@,s,.*,$(PROGRAM_PREFIX)&$(PROGRAM_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 30224)
+++ win32/configure.bat	(revision 30225)
@@ -57,13 +57,13 @@
   shift
 goto :loop
 :pprefix
-  echo>> ~tmp~.mak 	"RUBY_PREFIX=%~2" \
+  echo>> ~tmp~.mak 	"PROGRAM_PREFIX=%~2" \
   echo>>confargs.tmp %1=%2 \
   shift
   shift
 goto :loop
 :suffix
-  echo>> ~tmp~.mak 	"RUBY_SUFFIX=%~2" \
+  echo>> ~tmp~.mak 	"PROGRAM_SUFFIX=%~2" \
   echo>>confargs.tmp %1=%2 \
   shift
   shift
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 30224)
+++ win32/setup.mak	(revision 30225)
@@ -175,11 +175,11 @@
 
 -program-name-:
 	@type << >>$(MAKEFILE)
-!ifdef RUBY_PREFIX
-RUBY_PREFIX = $(RUBY_PREFIX)
+!ifdef PROGRAM_PREFIX
+PROGRAM_PREFIX = $(PROGRAM_PREFIX)
 !endif
-!ifdef RUBY_SUFFIX
-RUBY_SUFFIX = $(RUBY_SUFFIX)
+!ifdef PROGRAM_SUFFIX
+PROGRAM_SUFFIX = $(PROGRAM_SUFFIX)
 !endif
 !ifdef RUBY_INSTALL_NAME
 RUBY_INSTALL_NAME = $(RUBY_INSTALL_NAME)

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