diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-09-17 20:50:56 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-09-17 21:16:36 +0200 |
| commit | ebae51f4900af1fbc1e024bab44412b74fc46fa7 (patch) | |
| tree | 5d768fad1a512fa98d11e076e6902d082d577f0a | |
| parent | f0d0e783dffcd7b659b0962bf68cde24bfa733bc (diff) | |
Simplify configudata.pm dependency generation
While we're at it, correct the fault in windows-makefile.tmpl
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 41240e68d745972d56dd037caf439d9c5032813f)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 41f52aa4dc..48b3476ca5 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -508,7 +508,7 @@ debug_logicals : # Building targets ################################################### -configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} +configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf @ WRITE SYS$OUTPUT "*************************************************" diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 7973e1092e..5e21e7f00d 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -827,7 +827,7 @@ openssl.pc: echo 'Version: '$(VERSION); \ echo 'Requires: libssl libcrypto' ) > openssl.pc -configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}) -} {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -} +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 diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 988dc93809..77fceecafc 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -322,7 +322,7 @@ uninstall_html_docs: # Building targets ################################################### -configdata.pm: "$(SRCDIR)\Configure" "{- join(" ", @{$config{build_file_templates}}) -}" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -} +configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." "$(PERL)" "$(SRCDIR)\Configure" reconf |