Use cp -R instead of CpMac -r in the macosx-dmg script on Mac OS X 10.4

diff --git a/extras/MacOSX/macosx-dmg b/extras/MacOSX/macosx-dmg
index 47dc7b8cbc3ecf204f5462e46e73b08dc61f2ce0..b95841372c041f6ddd4ccb7d1cad03fa76d4b4a7 100755 (executable)
--- 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