The branch master has been updated
via 6d2e0076e6a8146f3bdaa60151b2fa6e4df0d1bf (commit)
from 8984b552e74761c30f87b33cd5f0b436a27f8cbc (commit)
- Log -----------------------------------------------------------------
commit 6d2e0076e6a8146f3bdaa60151b2fa6e4df0d1bf
Author: FdaSilvaYY <fdasilv...@gmail.com>
Date: Thu Jun 3 16:28:21 2021 +0200
Use rd instead rmdir
to avoid collision with rmdir.exe from cygwin or msys
Original idea by Mladen Turk @mturk
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15610)
-----------------------------------------------------------------------
Summary of changes:
Configurations/windows-makefile.tmpl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index d6ba2d13fd..34b6c7878a 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -461,10 +461,10 @@ libclean:
-del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb
clean: libclean
- -rmdir /Q /S $(HTMLDOCS1_BLDDIRS)
- -rmdir /Q /S $(HTMLDOCS3_BLDDIRS)
- -rmdir /Q /S $(HTMLDOCS5_BLDDIRS)
- -rmdir /Q /S $(HTMLDOCS7_BLDDIRS)
+ -rd /Q /S $(HTMLDOCS1_BLDDIRS)
+ -rd /Q /S $(HTMLDOCS3_BLDDIRS)
+ -rd /Q /S $(HTMLDOCS5_BLDDIRS)
+ -rd /Q /S $(HTMLDOCS7_BLDDIRS)
{- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
{- join("\n\t", map { "-del /Q /F $_" } @MODULES) -}
{- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) -}
@@ -474,7 +474,7 @@ clean: libclean
-del /Q /S /F engines\*.lib engines\*.exp
-del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp
-del /Q /S /F test\*.exp
- -rmdir /Q /S test\test-runs
+ -rd /Q /S test\test-runs
distclean: clean
-del /Q /F configdata.pm
