From: Mark Andrews <marka@isc.org>
Date: Thu, 7 Mar 2013 04:42:06 +0000 (+1100)
Subject: add PRODUCT to version.h; handle empty PATCHVER
X-Git-Tag: v9.10.0a1~448^2~95
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=caf22ac0db24bc5e370bac2fdf56e12437bfd7df;p=thirdparty%2Fbind9.git

add PRODUCT to version.h; handle empty PATCHVER
(cherry picked from commit b0f3042e37c697759903b15442bacbce0f873fc9)
---

diff --git a/win32utils/makeversion.pl b/win32utils/makeversion.pl
index afae0fe55ba..de812b41027 100644
--- a/win32utils/makeversion.pl
+++ b/win32utils/makeversion.pl
@@ -92,11 +92,16 @@ print OUTVERSIONFILE '
 
 ';
 
+if ($Versions{'PATCHVER'} != "") {
 $Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}.$Versions{'PATCHVER'}";
+} else {
+	$Version = "$Versions{'MAJORVER'}.$Versions{'MINORVER'}";
+}
 $Version = "$Version$Versions{'RELEASETYPE'}$Versions{'RELEASEVER'}";
 print "BIND Version: $Version\n";
 
-print OUTVERSIONFILE "#define VERSION \"$Version\"\n\n";
+print OUTVERSIONFILE "#define VERSION \"$Version\"\n";
+print OUTVERSIONFILE "#define PRODUCT \"$Versions{'PRODUCT'}\"\n\n";
 
 foreach $dir (@dirlist) {
 	$apifile = "../lib/$dir/api";