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) \
Index: aclocal.m4
===================================================================
diff -u -r77a193c118f4ae2b0ccd0913e39326e4f0f53fe6 -raa25ce8555c6222dd322f95b14c44c5fadffe85e
--- aclocal.m4	(.../aclocal.m4)	(revision 77a193c118f4ae2b0ccd0913e39326e4f0f53fe6)
+++ aclocal.m4	(.../aclocal.m4)	(revision aa25ce8555c6222dd322f95b14c44c5fadffe85e)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
Index: configure
===================================================================
diff -u -r52070e0d2061d422a1985eaf2f8d0a7d66dbb0aa -raa25ce8555c6222dd322f95b14c44c5fadffe85e
--- configure	(.../configure)	(revision 52070e0d2061d422a1985eaf2f8d0a7d66dbb0aa)
+++ configure	(.../configure)	(revision aa25ce8555c6222dd322f95b14c44c5fadffe85e)
@@ -9999,9 +9999,9 @@
 # target, defined in Makefile.in
 #--------------------------------------------------------------------
 
-CONFIG_CLEAN_FILES="Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish ${srcdir}/doc/version.inc autom4te.cache/"
+CONFIG_CLEAN_FILES="Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish nxsh nxwish ${srcdir}/doc/version.inc autom4te.cache/"
 
-ac_config_files="$ac_config_files Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish ${srcdir}/doc/version.inc"
+ac_config_files="$ac_config_files Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish nxsh nxwish ${srcdir}/doc/version.inc"
 
 
 #--------------------------------------------------------------------
@@ -10720,7 +10720,6 @@
     "${srcdir}/nsfConfig.sh") CONFIG_FILES="$CONFIG_FILES ${srcdir}/nsfConfig.sh" ;;
     "${srcdir}/library/xotcl/xotclsh") CONFIG_FILES="$CONFIG_FILES ${srcdir}/library/xotcl/xotclsh" ;;
     "${srcdir}/library/xotcl/xowish") CONFIG_FILES="$CONFIG_FILES ${srcdir}/library/xotcl/xowish" ;;
-    "${srcdir}/unix/pkgIndex.unix") CONFIG_FILES="$CONFIG_FILES ${srcdir}/unix/pkgIndex.unix" ;;
     "nxsh") CONFIG_FILES="$CONFIG_FILES nxsh" ;;
     "nxwish") CONFIG_FILES="$CONFIG_FILES nxwish" ;;
     "${srcdir}/doc/version.inc") CONFIG_FILES="$CONFIG_FILES ${srcdir}/doc/version.inc" ;;
Index: configure.ac
===================================================================
diff -u -r1ddf01fece5863ff539c96a98585edd27184f2cc -raa25ce8555c6222dd322f95b14c44c5fadffe85e
--- configure.ac	(.../configure.ac)	(revision 1ddf01fece5863ff539c96a98585edd27184f2cc)
+++ configure.ac	(.../configure.ac)	(revision aa25ce8555c6222dd322f95b14c44c5fadffe85e)
@@ -461,7 +461,7 @@
 dnl Change the value of -this- macro if you want to add or remove
 dnl such files.
 
-AC_DEFUN([CONFIG_OUTPUT_FILES], [[Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish ${srcdir}/unix/pkgIndex.unix nxsh nxwish ${srcdir}/doc/version.inc]])
+AC_DEFUN([CONFIG_OUTPUT_FILES], [[Makefile ${srcdir}/nsfConfig.sh ${srcdir}/library/xotcl/xotclsh ${srcdir}/library/xotcl/xowish nxsh nxwish ${srcdir}/doc/version.inc]])
 
 #--------------------------------------------------------------------
 # the value of this variable is set to the files which are to be
Fisheye: Tag aa25ce8555c6222dd322f95b14c44c5fadffe85e refers to a dead (removed) revision in file `unix/pkgIndex.unix.in'.
Fisheye: No comparison available.  Pass `N' to diff?