From: Steve Hay <SteveHay@planit.com>
Date: Fri, 4 Mar 2005 17:19:46 +0000 (+0000)
Subject: A better fix than change 24005 was ;)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=65980d9413eea8415cdea4a9a608257b175e4fb6;p=p5sagit%2Fp5-mst-13.2.git

A better fix than change 24005 was ;)

Actually, "@echo." still emits a blank line.  Use "@rem" instead as the
no-op.  This was being used in the Win95 case, but works fine on WinNT
too, and is actually what ExtUtils-MakeMaker uses.

Also change the nmake Makefile.

p4raw-id: //depot/perl@24006
---

diff --git a/win32/Makefile b/win32/Makefile
index 40ea15e..5085628 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -525,7 +525,7 @@ CFGH_TMPL	= config_H.vc
 
 XCOPY		= xcopy /f /r /i /d
 RCOPY		= xcopy /f /r /i /e /d
-NOOP		= @echo
+NOOP		= @rem
 NULL		=
 
 DEL		= del
diff --git a/win32/makefile.mk b/win32/makefile.mk
index dfb3fb4..0a11611 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -690,7 +690,7 @@ PERLDLL		= ..\perl59.dll
 
 XCOPY		= xcopy /f /r /i /d
 RCOPY		= xcopy /f /r /i /e /d
-NOOP		= @echo.
+NOOP		= @rem
 
 #
 # filenames given to xsubpp must have forward slashes (since it puts
@@ -883,7 +883,6 @@ CFG_VARS	=					\
 .IF "$(IS_WIN95)" == "define"
 MK2 		= .\makefile.95
 RIGHTMAKE	= __switch_makefiles
-NOOP		= @rem
 .ELSE
 MK2		= __not_needed
 RIGHTMAKE	=