diff options
| author | Matt Caswell <matt@openssl.org> | 2021-11-24 10:11:45 +0000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-11-26 10:28:19 +1000 |
| commit | 7182ad7925077a825e451d09c59c2181d8533dc6 (patch) | |
| tree | 7b09a8b9f27ce3e53da36d6652f75e3e00045d98 /Configurations | |
| parent | 1c981ebb6e3346ebd0e76d0100ad0e1e854dbdda (diff) | |
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 <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17128)
(cherry picked from commit bc6d9c9395a74a31b4e0c4a8cd729197adbf6a46)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files 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" -} |