--- Makefile.in.orig	Thu Feb 17 01:08:00 2000
+++ Makefile.in	Wed Jun  7 16:07:39 2000
@@ -500,11 +500,11 @@
 	pwd=`pwd`; cd $(TNM_TEST_DIR); $$pwd/scotty all.tcl
 
 install: @INSTALL_TARGETS@
-	@echo ""
-	@echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)"
-	@echo "which require root permissions. Please get root permissions"
-	@echo "and type >> make sinstall << to install them setuid root."
-	@echo ""
+#	@echo ""
+#	@echo "The Tnm extension includes two programs (nmicmpd, nmtrapd)"
+#	@echo "which require root permissions. Please get root permissions"
+#	@echo "and type >> make sinstall << to install them setuid root."
+#	@echo ""
 
 install-bin: tnm-install-bin tki-install-bin
 
@@ -528,7 +528,7 @@
 	@$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION)
 	@$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
 	@chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX)
-	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
+	@echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl
 
 tnm-install-man:
 	@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN8_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
@@ -708,10 +708,14 @@
 		fi; \
 	    done;
 	@echo "Installing tkined$(TKI_VERSION) and tkined$(TKI_VERSION)$(SHLIB_SUFFIX)"
-	@$(INSTALL_PROGRAM) tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
+	@$(INSTALL_DATA) -m 555 tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION)
+	@sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh
+	@sed s,@PREFIX@,${prefix},g scotty.sh.in >scotty.sh
+	@$(INSTALL_DATA) -m 555 tkined.sh ${BIN_INSTALL_DIR}/tkined
+	@$(INSTALL_DATA) -m 555 scotty.sh ${BIN_INSTALL_DIR}/scotty
 	@$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
 	@chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX)
-	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
+	@echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl
 	@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
 
 tki-install-man: