diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-09 00:14:56 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-09 02:37:29 +0100 |
| commit | 12ccb021be9e1c4c947e020ea2079e985b329a8a (patch) | |
| tree | a7ee9238443908001267210e3567c7dfe01e9d2b /Configurations | |
| parent | 318447bceb3aa2c50ac0081bdb4e917f8704e7da (diff) | |
| download | openssl-12ccb021be9e1c4c947e020ea2079e985b329a8a.tar.gz | |
Unix Makefile: Make sure to use $(PERL) when running ./Configure
For consistency, it's better to use the perl that was specified to
Configure last time it was called.
Use case:
perl v5.8.8 was first along $PATH, perl v5.22.2 was available and
specified as: PERL=/opt/local/bin/perl ./config. When make wanted to
reconfigure and called './Configure reconf', configuration broke down,
complaining about a perl that's too old.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1884)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 28ec045b9e..1c85637f49 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -769,7 +769,7 @@ tar: cd $(SRCDIR); ls -l $(TARFILE).gz dist: - @$(MAKE) PREPARE_CMD='./Configure dist' tar + @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' tar # Helper targets ##################################################### @@ -828,7 +828,7 @@ openssl.pc: configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." - $(SRCDIR)/Configure reconf + $(PERL) $(SRCDIR)/Configure reconf @echo "**************************************************" @echo "*** ***" @echo "*** Please run the same make command again ***" |