diff options
| author | Ben Laurie <ben@links.org> | 2014-05-24 15:46:13 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-05-24 15:48:24 +0100 |
| commit | 3435ef467fca3212892cae6de1b1fb90de61dce8 (patch) | |
| tree | 9bbcd89925d5bcbb2b4346e69a1b7e2d42665f3d /util | |
| parent | c90c694bc489bacfd689ed7909702a95b839bdde (diff) | |
Only copy opensslconf.h at init time.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index cbf845ae79..324871f629 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -404,6 +404,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 ($shlib) { $extra_install= <<"EOF"; @@ -581,6 +586,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) |