Use the registered conf file names as dependencies to build configdata.pm

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit dc660c70b52c552aa4eb9659963bfbe6ab18bec0)
This commit is contained in:
Richard Levitte 2016-09-14 22:22:20 +02:00 committed by Richard Levitte
parent efd2379412
commit b5edd178ca
3 changed files with 3 additions and 3 deletions

View File

@ -508,7 +508,7 @@ debug_logicals :
# Building targets ################################################### # Building targets ###################################################
configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -} configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
@ WRITE SYS$OUTPUT "Reconfiguring..." @ WRITE SYS$OUTPUT "Reconfiguring..."
perl $(SRCDIR)Configure reconf perl $(SRCDIR)Configure reconf
@ WRITE SYS$OUTPUT "*************************************************" @ WRITE SYS$OUTPUT "*************************************************"

View File

@ -827,7 +827,7 @@ openssl.pc:
echo 'Version: '$(VERSION); \ echo 'Version: '$(VERSION); \
echo 'Requires: libssl libcrypto' ) > openssl.pc echo 'Requires: libssl libcrypto' ) > openssl.pc
configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -} configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}, @{$config{conf_files}}) -}
@echo "Detected changed: $?" @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
$(SRCDIR)/Configure reconf $(SRCDIR)/Configure reconf

View File

@ -322,7 +322,7 @@ uninstall_html_docs:
# Building targets ################################################### # Building targets ###################################################
configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}) -} configdata.pm: "{- $config{build_file_template} -}" "$(SRCDIR)\Configurations\common.tmpl" "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_infos}}, @{$config{conf_files}}) -}
@echo "Detected changed: $?" @echo "Detected changed: $?"
@echo "Reconfiguring..." @echo "Reconfiguring..."
"$(PERL)" "$(SRCDIR)\Configure" reconf "$(PERL)" "$(SRCDIR)\Configure" reconf