nobu	2017-12-03 13:41:06 +0900 (Sun, 03 Dec 2017)

  New Revision: 60985

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60985

  Log:
    setup.mak: make Makefile stable
    
    * win32/setup.mak (-basic-vars-): moved BASERUBY and HAVE_BASERUBY
      definition to make Makefile stable when they have been defaulted.

  Modified files:
    trunk/win32/setup.mak
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 60984)
+++ win32/setup.mak	(revision 60985)
@@ -48,12 +48,9 @@ EXTSTATIC = $(EXTSTATIC) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L48
 !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) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L63
 
 # 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/