Index: Makefile.in
===================================================================
diff -u -r6f2b5aabb36c05dd3609e8035aa7be5dd6f3f5b5 -raa25ce8555c6222dd322f95b14c44c5fadffe85e
--- Makefile.in	(.../Makefile.in)	(revision 6f2b5aabb36c05dd3609e8035aa7be5dd6f3f5b5)
+++ Makefile.in	(.../Makefile.in)	(revision aa25ce8555c6222dd322f95b14c44c5fadffe85e)
@@ -452,15 +452,15 @@
 	done;
 
 install:	install-binaries install-shells \
-		install-libraries install-doc \
+		install-libraries install-pkgIndex install-doc \
 		install-xotcl-shells \
 		install-xotcl-libraries
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
 	for dir in $$dirs ; do \
 	   if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1 ; fi ; \
 	done; fi;
 
-install-binaries: binaries install-lib-binaries install-bin-binaries install-pkgIndex
+install-binaries: binaries install-lib-binaries install-bin-binaries
 
 install-aol: install-binaries install-libraries install-xotcl-libraries
 	@if test -d $(DESTDIR)/$(aol_prefix)/modules/tcl/; then \
@@ -504,9 +504,6 @@
 	       $(INSTALL_DATA) $$i $(DESTDIR)$(libdir)/tcl8/site-tcl/; \
 	    fi; \
 	done;
-	@echo "    Installing pkgIndex.tcl for nsf in $(DESTDIR)$(pkglibdir)/pkgIndex.tcl"
-	@echo "" >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
-	@cat $(srcdir)/unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
 	@$(INSTALL_DATA) $(srcdir)/nsfConfig.sh $(DESTDIR)$(libdir)/
 
 install-xotcl-libraries: install-libraries
@@ -743,24 +740,20 @@
 
 pkgIndex.tcl: $(PKG_LIB_FILE)
 	@echo "if {[package vsatisfies [package provide Tcl] 9]} {" > pkgIndex.tcl
-	@echo "    package ifneeded nsf @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
-	@echo "	    [list load [file join \$$dir @PKG_LIB_FILE9@] Nsf]" >> pkgIndex.tcl
+	@echo "    package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
+	@echo "	    \"[list load [file join \$$dir @PKG_LIB_FILE9@]];" >> pkgIndex.tcl
+	@echo "             [list package provide @PACKAGE_NAME@ @PACKAGE_VERSION@]\"" >> pkgIndex.tcl
 	@echo "} else {" >> pkgIndex.tcl
-	@echo "    package ifneeded nsf @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
-	@echo "	    [list load [file join \$$dir @PKG_LIB_FILE8@] Nsf]" >> pkgIndex.tcl
+	@echo "    package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
+	@echo "	    \"[list load [file join \$$dir @PKG_LIB_FILE8@]];" >> pkgIndex.tcl
+	@echo "             [list package provide @PACKAGE_NAME@ @PACKAGE_VERSION@]\"" >> pkgIndex.tcl
 	@echo "}" >> pkgIndex.tcl
-#	@echo "package provide nsf $(PACKAGE_VERSION)" >> pkgIndex.tcl
 
+install-pkgIndex: pkgIndex.tcl
+	@echo "    Adding to pkgIndex.tcl for @PACKAGE_NAME@ in $(DESTDIR)$(pkglibdir)/pkgIndex.tcl"
+	@echo "" >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
+	@cat $< >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
 
-install-pkgIndex:
-	@echo "if {[package vsatisfies [package provide Tcl] 9]} {" > pkgIndex.tcl
-	@echo "    package ifneeded nsf @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
-	@echo "	    [list load [file join \$$dir @PKG_LIB_FILE9@] Nsf]" >> pkgIndex.tcl
-	@echo "} else {" >> pkgIndex.tcl
-	@echo "    package ifneeded nsf @PACKAGE_VERSION@ \\" >> pkgIndex.tcl
-	@echo "	    [list load [file join \$$dir @PKG_LIB_FILE8@] Nsf]" >> pkgIndex.tcl
-	@echo "}" >> pkgIndex.tcl
-
 #nxsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
 #	$(CC) -rdynamic -o $@ tclAppInit.o \
 #		$(CFLAGS)  $(TCL_LIB_SPEC) \