--- a/smalltalk	Sat Sep 30 22:11:36 2000 +0200
+++ b/smalltalk	Wed Oct 11 12:18:01 2000 +0200
@@ -42,8 +42,15 @@
 fi
 
 STX=stx
+STX_BINDIR=.
 DEBUGGER=
 
+if test -x `dirname $0`/stx; then
+    STX_BINDIR=`dirname $0`
+    STX=`dirname $0`/stx
+    cd $STX_BINDIR
+fi
+
 # notice: STXLIBDIR is filled in here by install-sh script
 if test -z "$STX_LIBDIR"
 then
@@ -60,6 +67,7 @@
 	    STX_LIBDIR=`cd ${bindir}/../lib ; pwd`
 	fi
 fi
+
 if [ ! -d "$STX_LIBDIR" ]
 then
     if [ -d ../lib ]
@@ -67,6 +75,7 @@
 	STX_LIBDIR=`cd ../lib ; pwd`
     fi
 fi
+
 if test -z "$STX_PACKAGEDIR"
 then
     if [ -d ../packages ]
@@ -76,9 +85,15 @@
 	if [ -d $STX_LIBDIR/../packages ]
 	then
 	    STX_PACKAGEDIR=`cd $STX_LIBDIR/../packages ; pwd`
+	else
+	    if [ -f $STX_BINDIR/smalltalk.rc ]
+	    then
+		STX_PACKAGEDIR=`cd $STX_BINDIR/../../.. ; pwd`
+	    fi
 	fi
     fi
 fi
+
 if test -z "$STX_TOPDIR"
 then
     if [ -f ../lib/smalltalk.rc ]
@@ -88,6 +103,11 @@
 	if [ -f $STX_LIBDIR/../lib/smalltalk.rc ]
 	then
 	    STX_TOPDIR=`cd $STX_LIBDIR/.. ; pwd`
+	else
+	    if [ -f $STX_BINDIR/smalltalk.rc ]
+	    then
+		STX_TOPDIR=`cd $STX_BINDIR/../.. ; pwd`
+	    fi
 	fi
     fi
 fi
@@ -97,9 +117,8 @@
 # echo STX_PACKAGEDIR is $STX_PACKAGEDIR
 
 export STX_LIBDIR STX_PACKAGEDIR STX_TOPDIR
-if test -x `dirname $0`/stx; then
-	STX=`dirname $0`/stx
-fi
+
+# echo STX is $STX
 
 if [ "$1" = "-x" ]
 then
@@ -173,6 +192,21 @@
 	LD_LIBRARY_PATH=$STX_LIBDIR:$STX_LIBDIR/lib:$LD_LIBRARY_PATH
 	SHLIB_PATH=$STX_LIBDIR:$STX_LIBDIR/lib:$SHLIB_PATH
     fi
+else
+    STX_LIBDIR=$STX_BINDIR
+fi
+
+#
+# and in STX_BINDIR
+#
+
+if [ "$STX_BINDIR" != "" ]
+then
+    if [ "$STX_BINDIR" != "/usr/local/bin" ]
+    then
+        LD_LIBRARY_PATH=$STX_BINDIR:$LD_LIBRARY_PATH
+        SHLIB_PATH=$STX_BINDIR:$SHLIB_PATH
+    fi
 fi
 
 LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH
@@ -241,6 +275,8 @@
 #     echo "Please be patient - hp systems are very slow."
 # fi
 
-PATH=$PATH:.
+PATH=$PATH:$STX_BINDIR
 export PATH
+# echo PATH is $PATH
+# echo DISPLAY is $DISPLAY
 exec $DEBUGGER $STX ${1+"$@"}