summaryrefslogtreecommitdiffstats
path: root/win32/setup.mak
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 11:06:12 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 11:06:12 +0000
commit249221a6104f26b8602af0be416057a94fe9c8ad (patch)
tree6822be0bdd91c6d1d23f52f5854deb45880650bd /win32/setup.mak
parent065a055037dde6534b0899a371cd5c8b45d8407c (diff)
downloadruby-249221a6104f26b8602af0be416057a94fe9c8ad.tar.gz
ruby-249221a6104f26b8602af0be416057a94fe9c8ad.tar.xz
ruby-249221a6104f26b8602af0be416057a94fe9c8ad.zip
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@15113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/setup.mak')
-rw-r--r--win32/setup.mak18
1 files changed, 9 insertions, 9 deletions
diff --git a/win32/setup.mak b/win32/setup.mak
index acc111bc6..2b5d9c870 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-