From: FdaSilvaYY Date: Thu, 3 Jun 2021 14:28:21 +0000 (+0200) Subject: Use rd instead rmdir X-Git-Tag: openssl-3.0.0-beta1~177 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d2e0076e6a8146f3bdaa60151b2fa6e4df0d1bf;p=thirdparty%2Fopenssl.git Use rd instead rmdir to avoid collision with rmdir.exe from cygwin or msys Original idea by Mladen Turk @mturk Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15610) --- diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index d6ba2d13fd1..34b6c7878a5 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