From 4d0785b899a94bd80f2ff50f1fa59419e9d19182 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 6 Jan 1999 19:35:54 +0000
Subject: [PATCH] Release string now contains update name/level only if non
 blank/non zero.

---
 src/include/makeEpicsVersion.pl     | 4 +++-
 src/libCom/misc/makeEpicsVersion.pl | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/include/makeEpicsVersion.pl b/src/include/makeEpicsVersion.pl
index 4502c6482..f7eac99fa 100644
--- a/src/include/makeEpicsVersion.pl
+++ b/src/include/makeEpicsVersion.pl
@@ -17,7 +17,9 @@ while (<VARS>)
 	if (/CVS_DATE="\\(.*)"/)	{ $cvs_date = $1; }
 }
 
-$ver_str = "$ver.$rev.$mod.$upd_name.$upd_level";
+$ver_str = "$ver.$rev.$mod";
+$ver_str = "$ver_str.$upd_name" if $upd_name;
+$ver_str = "$ver_str.$upd_level" if $upd_level;
 
 print "Found EPICS Version $ver_str\n";
 
diff --git a/src/libCom/misc/makeEpicsVersion.pl b/src/libCom/misc/makeEpicsVersion.pl
index 4502c6482..f7eac99fa 100644
--- a/src/libCom/misc/makeEpicsVersion.pl
+++ b/src/libCom/misc/makeEpicsVersion.pl
@@ -17,7 +17,9 @@ while (<VARS>)
 	if (/CVS_DATE="\\(.*)"/)	{ $cvs_date = $1; }
 }
 
-$ver_str = "$ver.$rev.$mod.$upd_name.$upd_level";
+$ver_str = "$ver.$rev.$mod";
+$ver_str = "$ver_str.$upd_name" if $upd_name;
+$ver_str = "$ver_str.$upd_level" if $upd_level;
 
 print "Found EPICS Version $ver_str\n";