From dfc4c53ed16927e8479c30d2249e74218f180992 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Sun, 13 Nov 2005 20:29:27 +0000 Subject: [PATCH] Use cp -R instead of CpMac -r in the macosx-dmg script on Mac OS X 10.4 --- extras/MacOSX/macosx-dmg | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/extras/MacOSX/macosx-dmg b/extras/MacOSX/macosx-dmg index 47dc7b8cbc..b95841372c 100755 --- a/extras/MacOSX/macosx-dmg +++ b/extras/MacOSX/macosx-dmg @@ -36,10 +36,23 @@ dev=`hdid -nomount "${imgName}.dmg" | grep '/dev/disk[0-9]*' | cut -d " " -f 1` mkdir ./mountpoint mount -t hfs ${dev} ./mountpoint +HOSTMACHINE=`gcc -dumpmachine` +case $HOSTMACHINE in + ppc-darwin) +# Mac OS X < 10.4 + CP="/Developer/Tools/CpMac -r" + CPR="-r" + ;; + *) + CP="cp -R" + CPR="-R" + ;; +esac + echo "Copying contents to ${imgName}:" for i in ${dirName}/* ; do echo " ${i}" - /Developer/Tools/CpMac -r "${i}" ./mountpoint + ${CP} "${i}" ./mountpoint done umount ./mountpoint -- 2.39.2