From 6841c7d0de138d2d0b0523cc2fa1de29445c51cb Mon Sep 17 00:00:00 2001 From: rtoy <rtoy> Date: Sun, 9 Dec 2007 19:39:43 +0000 Subject: [PATCH] o We now have Darwin on x86 and ppc. Use uname to tell us which. o Change default compression to bzip instead of gzip, since we seem to always suppy bzipped binaries. --- tools/make-dist.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/make-dist.sh b/tools/make-dist.sh index 443c11092..6d34ab052 100755 --- a/tools/make-dist.sh +++ b/tools/make-dist.sh @@ -55,9 +55,12 @@ else OS=linux ;; Darwin) - ARCH=ppc - OS=darwin - ;; + OS=darwin + # x86 or ppc? + case `uname -m` in + i386) ARCH=x86 ;; + *) ARCH=ppc ;; + esac esac if [ $# -eq 3 ]; then @@ -90,9 +93,9 @@ VERSION=$2 ROOT=`dirname $0` -# If no compression options given, default to gzip +# If no compression options given, default to bzip if [ -z "$ENABLE_GZIP" -a -z "$ENABLE_BZIP" ]; then - ENABLE_GZIP="-g" + ENABLE_BZIP="-b" fi OPTIONS="${GROUP:+ -G ${GROUP}} ${OWNER:+ -O ${OWNER}} $ENABLE_GZIP $ENABLE_BZIP" -- GitLab