[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c1ea997aa84fde21d1fe3fbece3ba41436107e81 (commit)
      from  68dc37c12666604f8beac6e59507f809b7fd772b (commit)


- Log -----------------------------------------------------------------
commit c1ea997aa84fde21d1fe3fbece3ba41436107e81
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Mar 16 11:16:11 2016 +0000

    We should use $SRCDIR in Makefiles
    
    Normally we always refer to source files relative to $SRCDIR in Makefiles.
    However the reference to unix-Makefile.tmpl was using a fully expanded
    absolute path. This can cause problems for Mingw.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 117c404..ca11aef 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -797,7 +797,7 @@ openssl.pc:
 # wasn't passed down automatically.  It's quite safe to use it like we do
 # below; if it doesn't exist, the result will be empty and 'make' will pick
 # up $(MAKEFLAGS) which is passed down as an environment variable.
-configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
+configdata.pm: $(SRCDIR)/Configurations/unix-Makefile.tmpl $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -}
 	@echo "Detected changed: $?"
 	@echo "Reconfiguring..."
 	$(SRCDIR)/Configure reconf