diff options
author | FdaSilvaYY <fdasilvayy@gmail.com> | 2021-06-03 16:28:21 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-06-07 12:31:11 +0200 |
commit | 6d2e0076e6a8146f3bdaa60151b2fa6e4df0d1bf (patch) | |
tree | c71dedbbc4aba6d21d16447f3ebcaf7918cc7a7f /Configurations | |
parent | 8984b552e74761c30f87b33cd5f0b436a27f8cbc (diff) |
Use rd instead rmdir
to avoid collision with rmdir.exe from cygwin or msys
Original idea by Mladen Turk @mturk
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15610)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/windows-makefile.tmpl | 10 |
1 files 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 |