src/tclx/ucbsrc/makefile: Micropolis build fixes for recent macOS

[micropolis] / res / sounds / player

diff --git a/res/sounds/player b/res/sounds/player
index af26836209fb6819399f13f00d7b5c14f59db628..48e05d7e07f61330f5c454638ff8bcc20ed42295 100755 (executable)
--- a/res/sounds/player
+++ b/res/sounds/player
@@ -2,11 +2,14 @@
 
 PLAYER=
 
 
 PLAYER=
 

-if [ -x "`which aplay`" ]; then
+if type -a aplay &>/dev/null; then

        PLAYER=aplay
        PLAYER=aplay

-elif [ -x "`which play`" ]; then
+elif type -a afplay &>/dev/null; then
+       #afplay is shipped with OS X Leopard
+       PLAYER=afplay
+elif type -a play &>/dev/null; then

        PLAYER=play
        PLAYER=play

-elif [ -x "`which mplayer`" ]; then
+elif type -a mplayer &>/dev/null; then

        PLAYER="mplayer -nogui -nocache"
 fi
 
        PLAYER="mplayer -nogui -nocache"
 fi