diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | win32/setup.mak | 18 |
2 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Fri Jan 18 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Fri Jan 18 17:56:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval_intern.h, insnhelper.h, thread_pthread.h, vm_core.h, vm_opts.h: 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- |