From 5e0824bcd846a77520c6c1d6ff76dff23c7f52e6 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 18 Jan 2008 11:06:12 +0000
Subject: 	* win32/setup.mak (BASERUBY): nmake cannot execute ruby
 collectly 	  if the path of ruby.exe is quoted.

	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
	  a space will be inserted on the top of the line.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15113 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 acc111bc6c..2b5d9c8708 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -57,7 +57,7 @@ BASERUBY = $(BASERUBY)
 !endif
 <<
 !if !defined(BASERUBY)
-	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
+	@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I >> $(MAKEFILE)
 !endif
 
 -system-vars-: -runtime-
@@ -185,22 +185,22 @@ $(CPU) = $(PROCESSOR_LEVEL)
 !endif
 
 -alpha-: nul
-	@$(APPEND) $(ARCH) = alpha
+	@echo $(ARCH) = alpha>>$(MAKEFILE)
 -x64-: nul
-	@$(APPEND) $(ARCH) = x64
+	@echo $(ARCH) = x64>>$(MAKEFILE)
 -ia64-: nul
-	@$(APPEND) $(ARCH) = ia64
+	@echo $(ARCH) = ia64>>$(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-: -encs-
 
-- 
cgit v1.2.3