usa	2008-01-22 11:24:11 +0900 (Tue, 22 Jan 2008)

  New Revision: 15166

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/version.h
    branches/ruby_1_8/win32/Makefile.sub
    branches/ruby_1_8/win32/setup.mak

  Log:
    * win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
      a space will be inserted on the top of the line.
    
    * win32/Makefile.sub (MKFILES): stop make process if Makefile is
      updated.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/setup.mak?r1=15166&r2=15165&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15166&r2=15165&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/Makefile.sub?r1=15166&r2=15165&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15166&r2=15165&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15165)
+++ ruby_1_8/ChangeLog	(revision 15166)
@@ -1,3 +1,11 @@
+Tue Jan 22 11:22:47 2008  NAKAMURA Usaku  <usa@r...>
+
+	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
+	  a space will be inserted on the top of the line.
+
+	* win32/Makefile.sub (MKFILES): stop make process if Makefile is
+	  updated.
+
 Mon Jan 21 17:34:41 2008  Akinori MUSHA  <knu@i...>
 
 	* io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 15165)
+++ ruby_1_8/version.h	(revision 15166)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-01-21"
+#define RUBY_RELEASE_DATE "2008-01-22"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080121
+#define RUBY_RELEASE_CODE 20080122
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 21
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 15165)
+++ ruby_1_8/win32/Makefile.sub	(revision 15166)
@@ -272,6 +272,7 @@
 $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak
 	$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
 	@echo $(MKFILES) should be updated, re-run $(MAKE).
+	@exit 1
 
 CONFIG_H = ./.config.h.time
 
@@ -292,7 +293,7 @@
 #error MSC version unmatch: _MSC_VER: $(MSC_VER) is expected.
 #endif
 !if defined(USE_WINSOCK2)
-#define USE_WINSOCK2 1
+#define USE_WINSOCK2 $(USE_WINSOCK2)
 !endif
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
Index: ruby_1_8/win32/setup.mak
===================================================================
--- ruby_1_8/win32/setup.mak	(revision 15165)
+++ ruby_1_8/win32/setup.mak	(revision 15166)
@@ -14,7 +14,7 @@
 !endif
 OS = mswin32
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -41,8 +41,8 @@
 srcdir = $(srcdir:\=/)
 prefix = $(prefix:\=/)
 EXTSTATIC = $(EXTSTATIC)
-!if defined(USE_WINSOCK2)
-USE_WINSOCK2 = $(USE_WINSOCK2)
+!if "$(USE_WINSOCK2)" != "0"
+USE_WINSOCK2 = 1
 !endif
 !if defined(RDOCTARGET)
 RDOCTARGET = $(RDOCTARGET)
@@ -151,18 +151,18 @@
 !endif
 
 -alpha-: nul
-	@$(APPEND) $(ARCH) = alpha
+	@echo $(ARCH) = alpha>>$(MAKEFILE)
 -ix86-: nul
-	@$(APPEND) $(ARCH) = x86
+	@echo $(ARCH) = x86>>$(MAKEFILE)
 
 -i386-: -ix86-
-	@$(APPEND) $(CPU) = 3
+	@echo $(CPU) = 3>>$(MAKEFILE)
 -i486-: -ix86-
-	@$(APPEND) $(CPU) = 4
+	@echo $(CPU) = 4>>$(MAKEFILE)
 -i586-: -ix86-
-	@$(APPEND) $(CPU) = 5
+	@echo $(CPU) = 5>>$(MAKEFILE)
 -i686-: -ix86-
-	@$(APPEND) $(CPU) = 6
+	@echo $(CPU) = 6>>$(MAKEFILE)
 
 -epilogue-: nul
 	@type << >>$(MAKEFILE)

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