Commit f9856cc5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Have the build files use the executable configdata.pm 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5185)
parent b1fafff6

Configurations/descrip.mms.tmpl

+1 −2
Original line number Original line Diff line number Diff line
@@ -545,8 +545,7 @@ debug_logicals : 
# Building targets ###################################################

# Building targets ###################################################





configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$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 configdata.pm -r -v

        perl $(SRCDIR)Configure reconf

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

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

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

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

        @ WRITE SYS$OUTPUT "***   Please run the same mms command again   ***"

        @ WRITE SYS$OUTPUT "***   Please run the same mms command again   ***"

Configurations/unix-Makefile.tmpl

+1 −2
Original line number Original line Diff line number Diff line
@@ -785,8 +785,7 @@ openssl.pc: 




configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$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 "Detected changed: $?"

	@echo "Reconfiguring..."

	$(PERL) configdata.pm -r -v

	$(PERL) $(SRCDIR)/Configure reconf

	@echo "**************************************************"

	@echo "**************************************************"

	@echo "***                                            ***"

	@echo "***                                            ***"

	@echo "***   Please run the same make command again   ***"

	@echo "***   Please run the same make command again   ***"

Configurations/windows-makefile.tmpl

+1 −2
Original line number Original line Diff line number Diff line
@@ -370,8 +370,7 @@ uninstall_html_docs: 




configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$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 "Detected changed: $?"

	@echo "Reconfiguring..."

	"$(PERL)" configdata.pm -r -v

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

	@echo "**************************************************"

	@echo "**************************************************"

	@echo "***                                            ***"

	@echo "***                                            ***"

	@echo "***   Please run the same make command again   ***"

	@echo "***   Please run the same make command again   ***"