From 26f7341094bd023ff0e7b569eec8b207b9b8ab97 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Sun, 29 Dec 2013 20:25:36 +0200
Subject: [PATCH] Include platform name in also the directory name in binary
 pkgs

---
 tools/make_linux_package.sh   | 4 ++--
 tools/make_mac_package.sh     | 4 ++--
 tools/make_windows_package.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 342029a..1cbf478 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -6,7 +6,7 @@
 set -e
 set -x
 
-VERSION=`git describe --always`
+VERSION=`git describe --always`-linux-x86
 DEST=dist/$VERSION
 
 rm -rf $DEST
@@ -42,5 +42,5 @@ EOF
 chmod +x $DEST/generator-bin/protoc
 
 # Tar it all up
-( cd dist; tar -czf $VERSION-linux.tar.gz $VERSION )
+( cd dist; tar -czf $VERSION.tar.gz $VERSION )
 
diff --git a/tools/make_mac_package.sh b/tools/make_mac_package.sh
index 45ce71a..c5a956d 100755
--- a/tools/make_mac_package.sh
+++ b/tools/make_mac_package.sh
@@ -8,7 +8,7 @@
 set -e
 set -x
 
-VERSION=`git describe --always`
+VERSION=`git describe --always`-macosx-x86
 DEST=dist/$VERSION
 
 rm -rf $DEST
@@ -45,5 +45,5 @@ EOF
 chmod +x $DEST/generator-bin/protoc
 
 # Tar it all up
-( cd dist; tar -czf $VERSION-mac.tgz $VERSION )
+( cd dist; tar -czf $VERSION.tgz $VERSION )
 
diff --git a/tools/make_windows_package.sh b/tools/make_windows_package.sh
index 1a339a2..72de6f3 100755
--- a/tools/make_windows_package.sh
+++ b/tools/make_windows_package.sh
@@ -7,7 +7,7 @@
 set -e
 set -x
 
-VERSION=`git describe --always`
+VERSION=`git describe --always`-windows-x86
 DEST=dist/$VERSION
 
 rm -rf $DEST
@@ -52,4 +52,4 @@ find $DEST -name '*.c' -o -name '*.h' -o -name '*.txt' \
     -exec unix2dos '{}' \;
 
 # Zip it all up
-( cd dist; zip -r $VERSION-windows.zip $VERSION )
+( cd dist; zip -r $VERSION.zip $VERSION )
-- 
2.16.6