Index: nsfConfig.sh.in
===================================================================
diff -u -r0e8b567e2a1808c514f6340430920ad4d59953bc -r8eddf67371ec031084a6ef98fdec21e38dff85ff
--- nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision 0e8b567e2a1808c514f6340430920ad4d59953bc)
+++ nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
@@ -12,58 +12,58 @@
 # The information in this file is specific to a single platform.
 
 # XOTcl's version number.
-XOTCL_VERSION='@XOTCL_VERSION@'
-XOTCL_MAJOR_VERSION='@XOTCL_MAJOR_VERSION@'
-XOTCL_MINOR_VERSION='@XOTCL_MINOR_VERSION@'
-XOTCL_RELEASE_LEVEL='@XOTCL_RELEASE_LEVEL@'
+NSF_VERSION='@NSF_VERSION@'
+NSF_MAJOR_VERSION='@NSF_MAJOR_VERSION@'
+NSF_MINOR_VERSION='@NSF_MINOR_VERSION@'
+NSF_RELEASE_LEVEL='@NSF_RELEASE_LEVEL@'
 
 # String to pass to compiles to pick up includes during build
 # (i.e., assuming nothing has been installed)
-XOTCL_BUILD_INCLUDE_DIR='@XOTCL_BUILD_INCLUDE_DIR@'
-XOTCL_BUILD_INCLUDE_SPEC="-I${XOTCL_BUILD_INCLUDE_DIR}"
+NSF_BUILD_INCLUDE_DIR='@NSF_BUILD_INCLUDE_DIR@'
+NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}"
 
 # String to pass to compiles to pick up the XOTcl includes from their
 # installed directory.
-XOTCL_INCLUDE_DIR="@pkgincludedir@"
-XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR"
+NSF_INCLUDE_DIR="@pkgincludedir@"
+NSF_INCLUDE_SPEC="-I$NSF_INCLUDE_DIR"
 
 # The name of the XOTcl library (may be either a .a file or a shared library):
-XOTCL_LIB_FILE=@PKG_LIB_FILE@
+NSF_LIB_FILE=@PKG_LIB_FILE@
 
 # String to pass to linker to pick up the XOTcl library from its
 # build directory.
-XOTCL_BUILD_LIB_SPEC='@XOTCL_BUILD_LIB_SPEC@'
+NSF_BUILD_LIB_SPEC='@NSF_BUILD_LIB_SPEC@'
 
 # String to pass to linker to pick up the XOTcl library from its
 # installed directory.
-XOTCL_LIB_SPEC='@XOTCL_LIB_SPEC@'
+NSF_LIB_SPEC='@NSF_LIB_SPEC@'
 
 # The name of the XOTcl stub library (a .a file):
-# XOTCL_STUB_LIB_FILE=@PKG_STUB_LIB_FILE@
+# NSF_STUB_LIB_FILE=@PKG_STUB_LIB_FILE@
 
 # String to pass to linker to pick up the XOTcl stub library from its
 # build directory.
-XOTCL_BUILD_STUB_LIB_SPEC='@XOTCL_BUILD_STUB_LIB_SPEC@'
+NSF_BUILD_STUB_LIB_SPEC='@NSF_BUILD_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the XOTcl stub library from its
 # installed directory.
-XOTCL_STUB_LIB_SPEC='@XOTCL_STUB_LIB_SPEC@'
+NSF_STUB_LIB_SPEC='@NSF_STUB_LIB_SPEC@'
 
 # Name of the xotcl stub library with full path in build and install directory
-XOTCL_BUILD_STUB_LIB_PATH='@XOTCL_BUILD_STUB_LIB_PATH@'
-XOTCL_STUB_LIB_PATH='@XOTCL_STUB_LIB_PATH@'
+NSF_BUILD_STUB_LIB_PATH='@NSF_BUILD_STUB_LIB_PATH@'
+NSF_STUB_LIB_PATH='@NSF_STUB_LIB_PATH@'
 
 # Location of the top-level source directories from which XOTcl
 # was built.  This is the directory that contains generic, unix, etc.
 # If XOTcl was compiled in a different place than the directory
 # containing the source files, this points to the location of the sources,
 # not the location where XOTcl was compiled.
-XOTCL_SRC_DIR='@XOTCL_SRC_DIR@'
+NSF_SRC_DIR='@NSF_SRC_DIR@'
 
 # shared and unshared library suffix
-XOTCL_SHARED_LIB_SUFFIX=@SHARED_LIB_SUFFIX@
-XOTCL_UNSHARED_LIB_SUFFIX=@UNSHARED_LIB_SUFFIX@
+NSF_SHARED_LIB_SUFFIX=@SHARED_LIB_SUFFIX@
+NSF_UNSHARED_LIB_SUFFIX=@UNSHARED_LIB_SUFFIX@
 
 # the shell in whose installation dirs the xotcl package is installed
-XOTCL_COMPATIBLE_TCLSH=@XOTCL_COMPATIBLE_TCLSH@
+NSF_COMPATIBLE_TCLSH=@NSF_COMPATIBLE_TCLSH@