From 2e0956ba6dd04ae80d54eb4e03bed5a59e2a94c7 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 28 Feb 2016 01:13:17 +0100 Subject: Unified - have configdata.pm depend on a few more things Reviewed-by: Andy Polyakov --- Configurations/descrip.mms.tmpl | 2 +- Configurations/unix-Makefile.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Configurations') diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 38fa4388b9..5c575d095d 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -393,7 +393,7 @@ debug_logicals : # Building targets ################################################### -configdata.pm : {- sourcefile("Configurations", "descrip.mms.tmpl") -} $(SRCDIR)Configure ! $(SRCDIR)config.com +configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), sourcefile("Configurations", "common.tmpl")) -} $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_infos}}) -} @ WRITE SYS$OUTPUT "Detected changed: $?" @ WRITE SYS$OUTPUT "Reconfiguring..." perl $(SRCDIR)Configure reconf diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index cff0023a3e..066f3d70fb 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -796,7 +796,7 @@ openssl.pc: # wasn't passed down automatically. It's quite safe to use it like we do # below; if it doesn't exist, the result will be empty and 'make' will pick # up $(MAKEFLAGS) which is passed down as an environment variable. -configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configure $(SRCDIR)/config +configdata.pm: {- $config{build_file_template} -} $(SRCDIR)/Configurations/common.tmpl $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_infos}}) -} @echo "Detected changed: $?" @echo "Reconfiguring..." $(SRCDIR)/Configure reconf -- cgit v1.2.3