--- Makefile.in~	Mon Sep 21 17:02:16 1998
+++ Makefile.in	Sat Nov 28 20:47:19 1998
@@ -324,7 +324,7 @@
 
 # build expect binary that does not depend on Expect's shared libs
 expect:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
-	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
 	$(SETUID) expect
 
 # install Expect library
@@ -366,7 +366,7 @@
 # configure) separately for Expectk, but as far as I know, it doesn't hurt
 # anything here, so I'm not worrying about it.
 expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
-	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
 	$(SETUID) expectk
 
 expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
@@ -389,7 +389,7 @@
 # rule out for each file, sigh).
 $(EXP_SHARED_LIB_FILE): $(OFILES)
 	-rm -f $(EXP_SHARED_LIB_FILE)
-	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
+	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@ -Wl,-soname,$(SONAME)
 
 .PHONY: install-info install info
 install-info: