--- a/smalltalk	Fri Aug 08 17:56:33 1997 +0200
+++ b/smalltalk	Fri Aug 08 17:58:13 1997 +0200
@@ -32,16 +32,16 @@
 then
     if [ "$LD_LIBRARY_PATH" != "" ]
     then
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/openwin/lib:/usr/local/lib/smalltalk
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/openwin/lib:/usr/local/lib/smalltalk/lib
     else
-	LD_LIBRARY_PATH=.:/usr/openwin/lib:/usr/local/lib/smalltalk
+	LD_LIBRARY_PATH=.:/usr/openwin/lib:/usr/local/lib/smalltalk/lib
     fi
 else
     if [ "$LD_LIBRARY_PATH" != "" ]
     then
-	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib/smalltalk
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib/smalltalk/lib
     else
-	LD_LIBRARY_PATH=.:/usr/local/lib/smalltalk
+	LD_LIBRARY_PATH=.:/usr/local/lib/smalltalk/lib
     fi
 fi
 
@@ -51,7 +51,10 @@
 
 if [ "$STX_LIBDIR" != "" ]
 then
-    LD_LIBRARY_PATH=$STX_LIBDIR/lib:$LD_LIBRARY_PATH
+    if [ "$STX_LIBDIR" != "/usr/local/smalltalk" ]
+    then
+        LD_LIBRARY_PATH=$STX_LIBDIR/lib:$LD_LIBRARY_PATH
+    fi
 fi
 
 export LD_LIBRARY_PATH