diff options
| author | Steve Hay <SteveHay@planit.com> | 2005-03-04 17:19:46 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2005-03-04 17:19:46 +0000 |
| commit | 65980d9413eea8415cdea4a9a608257b175e4fb6 (patch) | |
| tree | 5e287f3656eea3706374df9cadda17be3259ba87 | |
| parent | 6bbff615ed723ae41b6e721cd8dfbcda8084de40 (diff) | |
| download | perl-65980d9413eea8415cdea4a9a608257b175e4fb6.tar.gz | |
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
| -rw-r--r-- | win32/Makefile | 2 | ||||
| -rw-r--r-- | win32/makefile.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/win32/Makefile b/win32/Makefile index 40ea15e9ee..50856288a0 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 dfb3fb4fde..0a11611bab 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 = |