diff options
Diffstat (limited to 'win32/setup.mak')
| -rw-r--r-- | win32/setup.mak | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index 151274781b..8676e3335b 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -48,12 +48,9 @@ EXTSTATIC = $(EXTSTATIC) !if defined(RDOCTARGET) RDOCTARGET = $(RDOCTARGET) !endif -!if defined(EXTOUT) +!if defined(EXTOUT) && "$(EXTOUT)" != ".ext" EXTOUT = $(EXTOUT) !endif -!if defined(BASERUBY) -BASERUBY = $(BASERUBY:/=\) -!endif !if defined(NTVER) NTVER = $(NTVER) !endif @@ -66,19 +63,21 @@ ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV) # TOOLS << -!if !defined(BASERUBY) - @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) - @echo !if "$$(BASERUBY)" == "">> $(MAKEFILE) - @echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE) - @echo HAVE_BASERUBY = no>> $(MAKEFILE) - @echo !else>> $(MAKEFILE) - @echo HAVE_BASERUBY = yes>> $(MAKEFILE) - @echo !endif>> $(MAKEFILE) -!elseif [$(BASERUBY) -eexit 2> nul] == 0 - @echo HAVE_BASERUBY = yes>> $(MAKEFILE) +!if defined(BASERUBY) + @echo BASERUBY = $(BASERUBY:/=\)>> $(MAKEFILE) !else - @echo HAVE_BASERUBY = no>> $(MAKEFILE) + @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) !endif + @type << >> $(MAKEFILE) +$(BANG)if "$$(BASERUBY)" == "" +BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 +HAVE_BASERUBY = no +$(BANG)elseif [$$(BASERUBY) -eexit 2> nul] == 0 +HAVE_BASERUBY = yes +$(BANG)else +HAVE_BASERUBY = no +$(BANG)endif +<< !if "$(GIT)" != "" @echo GIT = $(GIT)>> $(MAKEFILE) !endif |