Include version number in package names
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4284 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index d89d5cb..4465be0 100644
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -95,7 +95,7 @@
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 cc836f3..544dc21 100644
--- a/release/maketarball.in
+++ b/release/maketarball.in
@@ -19,7 +19,9 @@
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