From 94eed2b622b36881fdae73142b41bc23738e90b2 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Jan 2008 02:24:11 +0000
Subject: 	* 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.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/setup.mak | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'win32/setup.mak')

diff --git a/win32/setup.mak b/win32/setup.mak
index 86f6f6ae55..e87d1dbf39 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -14,7 +14,7 @@ prefix = /usr
 !endif
 OS = mswin32
 BANG = !
-APPEND = echo>>$(MAKEFILE)
+APPEND = echo.>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
 !else
@@ -41,8 +41,8 @@ MAKE = nmake
 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 @@ $(CPU) = $(PROCESSOR_LEVEL)
 !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)
-- 
cgit v1.2.3