diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 11:06:12 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 11:06:12 +0000 |
| commit | 5e0824bcd846a77520c6c1d6ff76dff23c7f52e6 (patch) | |
| tree | 6822be0bdd91c6d1d23f52f5854deb45880650bd /win32 | |
| parent | 8a9993dfee20296431ac49ec48860c89160835c1 (diff) | |
* 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
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/setup.mak | 18 |
1 files changed, 9 insertions, 9 deletions
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- |