MakeRelease.job: Use GCC Major.minor for upload dirname.

Since GCC 5, use Major.minor, and use Major.minor.point
for older releases.

This makes the upload dirname consistent with the
tarball names.

Change-Id: I7289fb510eedcfc73cbc5fe0be5c13da3db20fc4

1 files changed, 8 insertions, 6 deletions

diff --git a/MakeRelease.job b/MakeRelease.job
index 0dcfed53..ff82c6ac 100755
--- a/MakeRelease.job
+++ b/MakeRelease.job
@@ -182,12 +182,14 @@ fi
 # Major.Minor.Point
 gcc_full_version=`basename ${manifests[0]} | awk -F '-' '{ print $3 }'`
 
-# Before GCC 5 the GCC release name was Major.Minor.  With GCC 5 and later
-# the GCC release name is Major only.
-gcc_release="`echo $gcc_full_version | awk -F '.' '{ print $1 }'`"
-if test ${gcc_release} -lt 5; then
-    gcc_minor="`echo $gcc_full_version | awk -F '.' '{ print $2 }'`"
-    gcc_release="${gcc_release}.${gcc_minor}"
+# Before GCC 5 the GCC release name was Major.Minor.Point.  With GCC 5
+# and later the GCC release name is Major.Minor.
+gcc_major=`echo $gcc_full_version | awk -F '.' '{ print $1 }'`
+gcc_minor=`echo $gcc_full_version | awk -F '.' '{ print $2 }'`
+gcc_release=${gcc_major}.${gcc_minor}
+if test ${gcc_major} -lt 5; then
+    gcc_point=`echo $gcc_full_version | awk -F '.' '{ print $3 }'`
+    gcc_release=${gcc_major}.${gcc_minor}.${gcc_point}
 fi
 
 # Strip off everything but the DATE[-SPIN][-RC], complicated by the fact