setup.sh: Don't use `which`.

diff --git a/setup.sh b/setup.sh
index 6e2a68e556ca8fb2cfe3939f2861cfe4cb65d2a4..3a5e7f2f6b637d4a858f0e1333d80f30880c72e6 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -81,7 +81,7 @@ else
     fi
 fi
 # Absolute path to `ls`.
-ls_path=`which ls`
+ls_path=`installed_path ls`
 # GNU ls with colors.
 if test "x$ls_color" = xgnu; then
     ls_env=
@@ -130,7 +130,7 @@ if terminal_available screen-256color; then
         # rxvt-unicode binaries (e.g. Debian's rxvt-unicode-256color), the
         # terminal_info check for manual installations which modify
         # rxvt-unicode's terminfo entry.
-        urxvt_path=`which urxvt`
+        urxvt_path=`installed_path urxvt`
         urxvt_grep=`strings "$urxvt_path" | grep '^TERM=rxvt-'`
         if test x"$urxvt_grep" = 'xTERM=rxvt-unicode-256color' \
                 || terminal_info rxvt-unicode \