From c1ea997aa84fde21d1fe3fbece3ba41436107e81 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 16 Mar 2016 11:16:11 +0000 Subject: [PATCH] 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 Reviewed-by: Richard Levitte --- 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 117c404ff2..ca11aef344 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 -- 2.25.1