[interchange] Move version-detecting code earlier in Makefile.PL when stamping
David Christensen <[email protected]> Fri, 17 Nov 2017 23:26:58 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit b459d6e6b917d24a430f23071f6b50c5a8022b2e Author: David Christensen <[email protected]> Date: Fri Nov 17 17:25:17 2017 -0600 Move version-detecting code earlier in Makefile.PL when stamping This fixed an issue with not properly stamping when generating via `perl Makefile.PL nocopy` Reported-by: Josh Lavin <[email protected]> Makefile.PL | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- diff --git a/Makefile.PL b/Makefile.PL index 7de893b..81d513a 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -296,6 +296,13 @@ sub initialize { $MV::Default{RPMBUILDDIR} = $X{RPMBUILDDIR}; } + # if we are building from a git checkout, then set the VERSION based on the + # closest git tag, otherwise use the last hard-coded version + + $X{VERSION} = get_dist_version(); + system(qq{echo '"$X{VERSION}"' > _ic_version}); + + return \%X if $MV::Default{nocopy}; my $uid = $MV::Default{INTERCHANGE_USER}; @@ -706,12 +713,6 @@ EOF # Check for extra needed libraries extra_libs($realdir); - # if we are building from a git checkout, then set the VERSION based on the - # closest git tag, otherwise use the last hard-coded version - - $X{VERSION} = get_dist_version(); - system(qq{echo '"$X{VERSION}"' > _ic_version}); - mk_initp(\%X); delete $X{RPMBUILDDIR}; return \%X;