aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-18 10:45:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-18 10:45:05 +0000
commit3175fbf194acfa93282cdd6bc03ec29fb4fd608a (patch)
treeff8f273bb8329895667f420acea64434bb623dfc /win32
parented4c5f38ba25e61a8c65abad4254317e253e36e8 (diff)
downloadruby-3175fbf194acfa93282cdd6bc03ec29fb4fd608a.tar.gz
* win32/Makefile.sub: put an empty line between stub and script.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-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 ...