Index: nsfConfig.sh.in
===================================================================
diff -u -N -rc1c507da2c410901059af0ecafdb45ab4ae325a4 -ree398df04fa7ff4aa23c9e14174b45199129dc4f
--- nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision c1c507da2c410901059af0ecafdb45ab4ae325a4)
+++ nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision ee398df04fa7ff4aa23c9e14174b45199129dc4f)
@@ -17,8 +17,8 @@
 
 # String to pass to compiles to pick up includes during build
 # (i.e., assuming nothing has been installed)
-NSF_BUILD_INCLUDE_DIR='@NSF_BUILD_INCLUDE_DIR@'
-NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}"
+NSF_BUILD_INCLUDE_DIR='@NSF_INCLUDE_DIR@'
+NSF_BUILD_INCLUDE_SPEC="-I${NSF_INCLUDE_DIR}"
 
 # String to pass to compiles to pick up the nsf includes from their
 # installed directory.
@@ -30,7 +30,7 @@
 
 # String to pass to linker to pick up the nsf library from its
 # build directory.
-NSF_BUILD_LIB_SPEC='@NSF_BUILD_LIB_SPEC@'
+NSF_BUILD_LIB_SPEC='@NSF_LIB_SPEC@'
 
 # String to pass to linker to pick up the nsf library from its
 # installed directory.
@@ -41,22 +41,22 @@
 
 # String to pass to linker to pick up the NSF stub library from its
 # build directory.
-NSF_BUILD_STUB_LIB_SPEC='@NSF_BUILD_STUB_LIB_SPEC@'
+NSF_BUILD_STUB_LIB_SPEC='@NSF_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the NSF stub library from its
 # installed directory.
 NSF_STUB_LIB_SPEC='@NSF_STUB_LIB_SPEC@'
 
 # Name of the NSF stub library with full path in build and install directory
-NSF_BUILD_STUB_LIB_PATH='@NSF_BUILD_STUB_LIB_PATH@'
+NSF_BUILD_STUB_LIB_PATH='@NSF_STUB_LIB_PATH@'
 NSF_STUB_LIB_PATH='@NSF_STUB_LIB_PATH@'
 
 # Location of the top-level source directories from which nsf
 # was built.  This is the directory that contains generic, unix, etc.
 # If nsf 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 nsf was compiled.
-NSF_SRC_DIR='@NSF_SRC_DIR@'
+NSF_SRC_DIR='@NSF_INCLUDE_DIR@'
 
 # shared and unshared library suffix
 NSF_SHARED_LIB_SUFFIX=@SHARED_LIB_SUFFIX@