[openssl] master update

Dr. Paul Dale pauli at openssl.org
Tue Jul 14 04:33:21 UTC 2020

The branch master has been updated
       via  d35bab46c9e5edfeadc756bac9dc38213f172c07 (commit)
      from  a01cae99ac384cb6a74b46ccdc90736fe0754958 (commit)

- Log -----------------------------------------------------------------
commit d35bab46c9e5edfeadc756bac9dc38213f172c07
Author: Daniel Bevenius <daniel.bevenius at gmail.com>
Date:   Thu Jul 9 07:26:38 2020 +0200

    Configurations: make Makefile tmpl files non-links
    This commit updates Configurations/README.md and turns the Makefile
    templates into non-links.
    The motivation for this is that not all template exist in the directory
    leading to 404 Not found errors when accessed.
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12401)


Summary of changes:
 Configurations/README.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Configurations/README.md b/Configurations/README.md
index 3fa80a3fab..be8c394d08 100644
--- a/Configurations/README.md
+++ b/Configurations/README.md
@@ -481,11 +481,9 @@ template file in `Configurations/` named like the build file, with
 `.tmpl` appended, or in case of possible ambiguity, a combination of
 the second `build_scheme` list item and the `build_file` name.  For
 example, if `build_file` is set to `Makefile`, the template could be
-[`Configurations/Makefile.tmpl`](Makefile.tmpl) or
-In case both [`Configurations/unix-Makefile.tmpl`](Makefile.tmpl) and
-[`Configurations/Makefile.tmpl`](Makefile.tmpl) are present, the former takes
+`Configurations/Makefile.tmpl` or `Configurations/unix-Makefile.tmpl`.
+In case both `Configurations/unix-Makefile.tmpl` and
+`Configurations/Makefile.tmpl` are present, the former takes precedence.
 The build-file template is processed with the perl module
 Text::Template, using `{-` and `-}` as delimiters that enclose the

More information about the openssl-commits mailing list