diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-09 00:14:56 +0100 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-11-09 02:37:53 +0100 |
| commit | df8dca7ac8d71b2fe5ec3a378c547dbfeb081d7e (patch) | |
| tree | b0e92eb0a7ce91264cb375d7014cc79be85a194c /Configurations | |
| parent | daa67522e0d33deadf6ac130ebe08805bb78c3a3 (diff) | |
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)
(cherry picked from commit 12ccb021be9e1c4c947e020ea2079e985b329a8a)
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 953fc1a8da..9f0990ca39 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -761,7 +761,7 @@ tar: cd $(SRCDIR); ls -l $(TARFILE).gz dist: - @$(MAKE) PREPARE_CMD='./Configure dist' tar + @$(MAKE) PREPARE_CMD='$(PERL) ./Configure dist' tar # Helper targets ##################################################### @@ -820,7 +820,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 ***" |