The branch master has been updated via bc6d9c9395a74a31b4e0c4a8cd729197adbf6a46 (commit) from 3e0441520b9a349dc50662919ea18f03dfc0d624 (commit)
- Log ----------------------------------------------------------------- commit bc6d9c9395a74a31b4e0c4a8cd729197adbf6a46 Author: Matt Caswell <m...@openssl.org> Date: Wed Nov 24 10:11:45 2021 +0000 Don't delete the doc/html directories when cleaning The doc/html sub-dirs get created by Configure. Therefore they should not be cleaned away by "nmake clean". Otherwise the following sequence fails: perl Configure VC-WIN64A nmake clean nmake nmake install Fixes #17114 Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/17128) ----------------------------------------------------------------------- Summary of changes: Configurations/windows-makefile.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 81a94ee19f..4718f118e3 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -462,10 +462,10 @@ libclean: -del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb clean: libclean - -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 $_" } @HTMLDOCS1) || "\@rem" -} + {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS3) || "\@rem" -} + {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS5) || "\@rem" -} + {- join("\n\t", map { "-del /Q /F $_" } @HTMLDOCS7) || "\@rem" -} {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) || "\@rem" -} {- join("\n\t", map { "-del /Q /F $_" } @MODULES) || "\@rem" -} {- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) || "\@rem" -}