aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-03-16 11:16:11 +0000
committerRichard Levitte <levitte@openssl.org>2016-03-16 13:35:18 +0100
commitc1ea997aa84fde21d1fe3fbece3ba41436107e81 (patch)
treed7123cb96bab12954ef2311a78cebf24d4cbdd87
parent68dc37c12666604f8beac6e59507f809b7fd772b (diff)
downloadopenssl-c1ea997aa84fde21d1fe3fbece3ba41436107e81.zip
openssl-c1ea997aa84fde21d1fe3fbece3ba41436107e81.tar.gz
openssl-c1ea997aa84fde21d1fe3fbece3ba41436107e81.tar.bz2
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@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
-rw-r--r--Configurations/unix-Makefile.tmpl2
1 files changed, 1 insertions, 1 deletions
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