From b9b9e4fb546905510fce5dcbd7e67f0bcb974c7b Mon Sep 17 00:00:00 2001
From: DRC <dcommander@users.sourceforge.net>
Date: Thu, 10 Feb 2011 22:21:34 +0000
Subject: [PATCH] Include version number in package names

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4284 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 CMakeLists.txt         | 6 +++---
 release/makemacpkg.in  | 4 ++--
 release/maketarball.in | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1447ebaf..854f712d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,11 +120,11 @@ add_subdirectory(win)
 # Installer
 #
 
-set(INST_NAME ${CMAKE_PROJECT_NAME})
-
 if(64BIT)
-  set(INST_NAME ${INST_NAME}64)
+  set(INST_NAME ${CMAKE_PROJECT_NAME}64-${VERSION})
   set(INST_DEFS -DWIN64)
+else()
+  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION})
 endif()
 
 if(MSVC_IDE)
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index d89d5cb3..4465be0d 100644
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -95,7 +95,7 @@ sudo osacompile -t APPL -o "$TMPDIR/dmg/Uninstall.app" $TMPDIR/uninstall.applesc
 sudo chown -R $USER "$TMPDIR/dmg/Uninstall.app" 
 hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \
 	-srcfolder "$TMPDIR/dmg" \
-	$TMPDIR/$PACKAGE_NAME.dmg 
-cp $TMPDIR/$PACKAGE_NAME.dmg . 
+	$TMPDIR/$PACKAGE_NAME-$VERSION.dmg 
+cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . 
 
 exit
diff --git a/release/maketarball.in b/release/maketarball.in
index cc836f34..544dc215 100644
--- a/release/maketarball.in
+++ b/release/maketarball.in
@@ -19,7 +19,9 @@ PACKAGE_NAME=@PACKAGE_NAME@
 VERSION=@VERSION@
 BUILD=@BUILD@
 SRCDIR=@srcdir@
-PACKAGE_FILE=$PACKAGE_NAME-`uname -s`-@host_cpu@.tar.gz
+OS=`uname -s`
+CPU=@host_cpu@
+PACKAGE_FILE=$PACKAGE_NAME-$OS-$CPU-$VERSION.tar.gz
 SERVER=0
 
 if [ $# -gt 0 ]; then
-- 
2.39.5