From e99057881800367c02fa6febddbaa1d8a6147000 Mon Sep 17 00:00:00 2001
From: MySQL Build Team <build@mysql.com>
Date: Thu, 15 Jan 2009 20:09:58 +0100
Subject: [PATCH] Added option "--short-product-tag=<string>" to
 "make_binary_distribution.sh", to enable product name and server suffix to
 differ.

---
 scripts/make_binary_distribution.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 339b2a4c219..0c4a6e2a717 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -60,13 +60,16 @@ STRIP=1				# Option ignored
 SILENT=0
 PLATFORM=""
 TMP=/tmp
+NEW_NAME=""			# Final top directory and TAR package name
 SUFFIX=""
+SHORT_PRODUCT_TAG=""		# If don't want server suffix in package name
 NDBCLUSTER=""			# Option ignored
 
 for arg do
   case "$arg" in
     --tmp=*)    TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
     --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
+    --short-product-tag=*) SHORT_PRODUCT_TAG=`echo "$arg" | sed -e "s;--short-product-tag=;;"` ;;
     --no-strip) STRIP=0 ;;
     --machine=*) machine=`echo "$arg" | sed -e "s;--machine=;;"` ;;
     --platform=*) PLATFORM=`echo "$arg" | sed -e "s;--platform=;;"` ;;
@@ -113,7 +116,11 @@ case $PLATFORM in
 esac
 
 # Change the distribution to a long descriptive name
-NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
+if [ x"$SHORT_PRODUCT_TAG = x"" ] ; then
+  NEW_NAME=mysql-$SHORT_PRODUCT_TAG-@VERSION@-$PLATFORM$SUFFIX
+else
+  NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-@VERSION@-$PLATFORM$SUFFIX
+fi
 
 # ----------------------------------------------------------------------
 # Define BASE, and remove the old BASE directory if any