From 894172f207437cb7564e8cd5f7b50f7cbfd068e1 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Sat, 24 May 2014 15:42:18 +0100 Subject: [PATCH] Only copy opensslconf.h at init time. --- util/mk1mf.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 90ae84b2f6..3da139dd32 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -455,6 +455,11 @@ for (;;) } close(IN); +# Remove opensslconf.h so it doesn't get updated if we configure a +# different branch. +$exheader =~ s/[^ ]+\/opensslconf.h//; +$header =~ s/[^ ]+\/opensslconf.h//; + if ($fips) { @@ -756,6 +761,7 @@ $banner # This needs to be invoked once, when the makefile is first constructed, or # after cleaning. init: \$(TMP_D) \$(LIB_D) \$(INC_D) \$(INCO_D) \$(BIN_D) \$(TEST_D) headers + \$(PERL) \$(SRC_D)/util/copy-if-different.pl "\$(SRC_D)/crypto/opensslconf.h" "\$(INCO_D)/opensslconf.h" headers: \$(HEADER) \$(EXHEADER) -- 2.25.1