summaryrefslogtreecommitdiffstats
path: root/Configurations
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-01-29 08:20:26 +0100
committerRichard Levitte <levitte@openssl.org>2018-01-29 21:56:47 +0100
commitf9856cc5b47ce850698f2ae2ddf7d32198af9652 (patch)
treedcce1a09d2311ff32bb1c5566c8cc6378ece6878 /Configurations
parentb1fafff631e1a10d96a45e4899667d0683a9ba09 (diff)
Have the build files use the executable configdata.pm
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5185)
Diffstat (limited to 'Configurations')
-rw-r--r--Configurations/descrip.mms.tmpl3
-rw-r--r--Configurations/unix-Makefile.tmpl3
-rw-r--r--Configurations/windows-makefile.tmpl3
3 files changed, 3 insertions, 6 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 87c6834a14..8876d3c2d6 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -545,8 +545,7 @@ debug_logicals :
# Building targets ###################################################
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
+ perl configdata.pm -r -v
@ WRITE SYS$OUTPUT "*************************************************"
@ WRITE SYS$OUTPUT "*** ***"
@ WRITE SYS$OUTPUT "*** Please run the same mms command again ***"
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 27d804c3c0..22e52634d1 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -785,8 +785,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..."
- $(PERL) $(SRCDIR)/Configure reconf
+ $(PERL) configdata.pm -r -v
@echo "**************************************************"
@echo "*** ***"
@echo "*** Please run the same make command again ***"
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 082ce0798d..854807345c 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -370,8 +370,7 @@ uninstall_html_docs:
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
+ "$(PERL)" configdata.pm -r -v
@echo "**************************************************"
@echo "*** ***"
@echo "*** Please run the same make command again ***"