pyrox.dev
1--- a/platforms/unix/config/bin.squeak.sh.in
2+++ b/platforms/unix/config/bin.squeak.sh.in
3@@ -1,7 +1,7 @@
4 #!/bin/sh
5 # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
6 # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
7-BIN=`/usr/bin/dirname "$0"`/../@expanded_relative_imgdir@
8+BIN=`dirname "$0"`/../@expanded_relative_imgdir@
9 GDB=
10 if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
11 export SQUEAK_PLUGINS="$BIN"
12@@ -26,7 +26,7 @@ fi
13 # libc (e.g. through the FFI) then it must use the same version that the VM uses
14 # and so it should take precedence over /lib libc. This is done by setting
15 # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
16-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
17+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
18 PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
19
20 if [ "$PLATFORMLIBDIR" = "" ]; then
21--- a/platforms/unix/config/squeak.sh.in
22+++ b/platforms/unix/config/squeak.sh.in
23@@ -1,7 +1,7 @@
24 #!/bin/sh
25 # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
26 # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
27-BIN=`/usr/bin/dirname "$0"`/@expanded_relative_imgdir@
28+BIN=`dirname "$0"`/@expanded_relative_imgdir@
29 GDB=
30 if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
31 export SQUEAK_PLUGINS="$BIN"
32@@ -26,7 +26,7 @@ fi
33 # libc (e.g. through the FFI) then it must use the same version that the VM uses
34 # and so it should take precedence over /lib libc. This is done by setting
35 # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
36-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
37+LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
38 PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'`
39
40 if [ "$PLATFORMLIBDIR" = "" ]; then