Commit b5edd178 authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

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



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit dc660c70)
parent efd23794

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ debug_logicals : 


# 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..."

        perl $(SRCDIR)Configure reconf

        @ WRITE SYS$OUTPUT "*************************************************"

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ openssl.pc: 
	    echo 'Version: '$(VERSION); \

	    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 "Reconfiguring..."

	$(SRCDIR)/Configure reconf

Configurations/windows-makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ uninstall_html_docs: 


# 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 "Reconfiguring..."

	"$(PERL)" "$(SRCDIR)\Configure" reconf