diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-12-02 09:48:44 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-12-26 00:49:07 +0100 |
| commit | 812500651954a7a084550d72d2f8ac9dc3158327 (patch) | |
| tree | 3c9f7afbb7982767f4d8ecba59baac8bdbe22b99 /Configurations | |
| parent | Removed now documented stuff from util/missing*.txt (diff) | |
| download | openssl-812500651954a7a084550d72d2f8ac9dc3158327.tar.xz openssl-812500651954a7a084550d72d2f8ac9dc3158327.zip | |
Configurations/windows-makefile.tmpl: HTMLDOCS are files, not directories
Remove them using "del", not "rmdir"
Fixes #10553
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10555)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 966212f3d6..8e0d098e20 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -3,6 +3,8 @@ ## ## {- join("\n## ", @autowarntext) -} {- + use File::Basename; + our $sover_dirname = platform->shlib_version_as_filename(); my $build_scheme = $target{build_scheme}; @@ -111,10 +113,22 @@ MISC_SCRIPTS={- && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}) -} -HTMLDOCS1={- join(" ", @{$unified_info{htmldocs}->{man1}}) -} -HTMLDOCS3={- join(" ", @{$unified_info{htmldocs}->{man3}}) -} -HTMLDOCS5={- join(" ", @{$unified_info{htmldocs}->{man5}}) -} -HTMLDOCS7={- join(" ", @{$unified_info{htmldocs}->{man7}}) -} +HTMLDOCS1={- our @HTMLDOCS1 = @{$unified_info{htmldocs}->{man1}}; + join(" ", @HTMLDOCS1) -} +HTMLDOCS3={- our @HTMLDOCS3 = @{$unified_info{htmldocs}->{man3}}; + join(" ", @HTMLDOCS3) -} +HTMLDOCS5={- our @HTMLDOCS5 = @{$unified_info{htmldocs}->{man5}}; + join(" ", @HTMLDOCS5) -} +HTMLDOCS7={- our @HTMLDOCS7 = @{$unified_info{htmldocs}->{man7}}; + join(" ", @HTMLDOCS7) -} +HTMLDOCS1_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS1; + join(' ', sort keys %dirs) -} +HTMLDOCS3_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS3; + join(' ', sort keys %dirs) -} +HTMLDOCS5_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS5; + join(' ', sort keys %dirs) -} +HTMLDOCS7_BLDDIRS={- my %dirs = map { dirname($_) => 1 } @HTMLDOCS7; + join(' ', sort keys %dirs) -} APPS_OPENSSL={- use File::Spec::Functions; "\"".catfile("apps","openssl")."\"" -} @@ -401,10 +415,10 @@ libclean: -del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb clean: libclean - -rmdir /Q /S $(HTMLDOCS1) - -rmdir /Q /S $(HTMLDOCS3) - -rmdir /Q /S $(HTMLDOCS5) - -rmdir /Q /S $(HTMLDOCS7) + -rmdir /Q /S $(HTMLDOCS1_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS3_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS5_BLDDIRS) + -rmdir /Q /S $(HTMLDOCS7_BLDDIRS) {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -} -del /Q /F $(MODULES) -del /Q /F $(SCRIPTS) |