--- Makefile.in.orig	Fri May  7 20:10:30 2004
+++ Makefile.in	Sun Jun 12 10:07:51 2005
@@ -24,7 +24,7 @@ TCLHDIRDASHI = @TCLHDIRDASHI@
 TCL_LIBRARY = @TCL_LIBRARY@
 
 # Tcl library uninstalled.  Should be something like -ltcl or ../tcl/libtcl.a
-TCLLIB = @TCL_BUILD_LIB_SPEC@
+TCLLIB = @TCL_LIB_SPEC@
 # Tcl library installed.  Should be something like -ltcl or ../tcl/libtcl.a
 TCLLIB_INSTALLED = @TCL_LIB_SPEC@
 
@@ -32,7 +32,7 @@ TCLLIB_INSTALLED = @TCL_LIB_SPEC@
 # Tk include files
 TKHDIRDASHI = @TKHDIRDASHI@
 # Tk library
-TKLIB = @TK_BUILD_LIB_SPEC@
+TKLIB = @TK_LIB_SPEC@
 TKLIB_INSTALLED = @TK_LIB_SPEC@
 # X11 include files and other flags to compiler
 X11_CFLAGS = @TK_XINCLUDES@
@@ -192,6 +192,7 @@ SHELL = @EXP_CONFIG_SHELL@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 AR = ar
@@ -208,6 +209,7 @@ FLAGS_TO_PASS = \
 	"HDEFS=$(HDEFS)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
 	"LDFLAGS=$(LDFLAGS)" \
 	"RUNTEST=$(RUNTEST)" \
@@ -368,7 +370,7 @@ install_shared_lib: $(EXP_LIB_FILES)
 	else true; fi
 	if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
 	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
-	  $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
+	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
 	else true; fi
 
 expect_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
@@ -451,7 +453,7 @@ install-libraries:
 	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
 	-for i in $(SCRIPT_LIST) ; do \
 	  if [ -f $$i ] ; then \
-	    $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
+	    $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i ; \
 	    rm -f $$i ; \
 	  else true; fi ; \
 	done