summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--win32/Makefile.sub13
1 files changed, 8 insertions, 5 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index df3ae39398..eba330b361 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -370,6 +370,8 @@ ruby: $(PROGRAM)
rubyw: $(WPROGRAM)
stub: $(STUBPROGRAM)
+!include $(srcdir)/common.mk
+
!ifdef SCRIPTPROGRAMS
!else if [echo>scriptbin.mk SCRIPTPROGRAMS = \]
!else if [for %I in ($(srcdir:/=\)\bin\*) do @echo>>scriptbin.mk %~nI.exe \]
@@ -380,9 +382,12 @@ stub: $(STUBPROGRAM)
!endif
!if [for %I in ($(srcdir:/=\)\bin\*) do @for %J in (\
"%~nI.exe: $$(srcdir)/bin/%~nI" \
-" @echo generating $$(@)" \
-" @copy /b $$(STUBPROGRAM) +<< +$$(srcdir:/=\)\bin\%~nI $$(@) > nul" \
-"" "<<" "" \
+" $$(ECHO) generating $$(@)" \
+" $$(Q) copy /y /b $$(STUBPROGRAM) $$(@) > nul" \
+" $$(Q) echo.>>$$(@)" \
+" $$(Q) echo.>>$$(@)" \
+" $$(Q) copy /b $$(@)+$$(srcdir:/=\)\bin\%~nI $$(@) > nul" \
+"" \
) do @echo.%~J>>scriptbin.mk]
!else
! include scriptbin.mk
@@ -397,8 +402,6 @@ $(SCRIPTPROGRAMS): $(STUBPROGRAM)
up::
@cd "$(srcdir:/=\)" && set LC_TIME=C && $(VCSUP)
-!include $(srcdir)/common.mk
-
update-mspec:
!if exist($(srcdir)/spec/mspec)
@echo updating mspec ...