Index: configure
===================================================================
diff -u -N -ra1f1c17c221b7f92384107a7acea8197dba957fb -rc1c507da2c410901059af0ecafdb45ab4ae325a4
--- configure	(.../configure)	(revision a1f1c17c221b7f92384107a7acea8197dba957fb)
+++ configure	(.../configure)	(revision c1c507da2c410901059af0ecafdb45ab4ae325a4)
@@ -628,11 +628,11 @@
 apps_actiweb
 libdirs_actiweb
 test_actiweb
+NSF_INCLUDE_DIR
 NSF_BUILD_INCLUDE_SPEC
 NSF_BUILD_INCLUDE_DIR
 XOWISH
 NXSH
-NSF_SRC_DIR
 NSF_STUB_LIB_PATH
 NSF_BUILD_STUB_LIB_PATH
 NSF_STUB_LIB_SPEC
@@ -641,6 +641,8 @@
 NSF_BUILD_LIB_SPEC
 UNSHARED_LIB_SUFFIX
 SHARED_LIB_SUFFIX
+NSF_PKG_LIBDIR
+NSF_SRC_DIR
 TCL_EXEC_PREFIX
 NSF_COMPATIBLE_TCLSH
 TCLSH_PROG
@@ -8946,10 +8948,17 @@
 # Next Scripting specific configs
 #
 
+#NSF_SRC_DIR=$srcdir
+NSF_SRC_DIR="`pwd`"
+
+
+eval "NSF_PKG_LIBDIR=\"${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}\""
+
+
 if test "${TEA_PLATFORM}" != "windows" ; then
 
-NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}"
-NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}"
+NSF_BUILD_LIB_SPEC="-L${NSF_SRC_DIR} -lnsf${PACKAGE_VERSION}"
+NSF_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsf${PACKAGE_VERSION}"
 
 # If someone wants to build without stubs, as it was the case for
 # earlier Tcl versions, we keep the following block as a reference.
@@ -8959,22 +8968,22 @@
 	NSF_BUILD_STUB_LIB_SPEC=""
 	NSF_STUB_LIB_SPEC=""
 else
-	NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-	NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-	NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}"
-	NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}"
+	NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+	NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
+	NSF_BUILD_STUB_LIB_SPEC="-L${NSF_SRC_DIR} -lnsfstub${PACKAGE_VERSION}"
+	NSF_STUB_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsfstub${PACKAGE_VERSION}"
 	$as_echo "#define COMPILE_NSF_STUBS 1" >>confdefs.h
 
 fi
 
 else
 
-NSF_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}"
-NSF_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}"
-NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-NSF_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}"
-NSF_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_LIB_SPEC="${NSF_SRC_DIR}/${PKG_LIB_FILE}"
+NSF_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_LIB_FILE}"
+NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_SPEC="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
 
 fi
 
@@ -8986,18 +8995,17 @@
 
 
 
-NSF_SRC_DIR=$srcdir
 
 
 
-
 # include dirs for nsf during build process (i.e., does not assume installed)
 NSF_BUILD_INCLUDE_DIR="${NSF_SRC_DIR}/generic"
 NSF_BUILD_INCLUDE_SPEC="-I${NSF_BUILD_INCLUDE_DIR}"
 
 
 
 
+eval "NSF_INCLUDE_DIR=\"$includedir\""
 
 
 
@@ -9006,6 +9014,9 @@
 
 
 
+
+
+
 #--------------------------------------------------------------------
 # the value of this variable is set to the files which are to be
 # removed when the user invokes 'make distclean' (i.e., those
Index: configure.ac
===================================================================
diff -u -N -ra1f1c17c221b7f92384107a7acea8197dba957fb -rc1c507da2c410901059af0ecafdb45ab4ae325a4
--- configure.ac	(.../configure.ac)	(revision a1f1c17c221b7f92384107a7acea8197dba957fb)
+++ configure.ac	(.../configure.ac)	(revision c1c507da2c410901059af0ecafdb45ab4ae325a4)
@@ -358,10 +358,17 @@
 # Next Scripting specific configs
 #
 
+#NSF_SRC_DIR=$srcdir
+NSF_SRC_DIR="`pwd`"
+AC_SUBST([NSF_SRC_DIR])
+
+eval "NSF_PKG_LIBDIR=\"${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}\""
+AC_SUBST([NSF_PKG_LIBDIR])
+
 if test "${TEA_PLATFORM}" != "windows" ; then
 
-NSF_BUILD_LIB_SPEC="-L`pwd` -lnsf${PACKAGE_VERSION}"
-NSF_LIB_SPEC="-L${pkglibdir} -lnsf${PACKAGE_VERSION}"
+NSF_BUILD_LIB_SPEC="-L${NSF_SRC_DIR} -lnsf${PACKAGE_VERSION}"
+NSF_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsf${PACKAGE_VERSION}"
 
 # If someone wants to build without stubs, as it was the case for
 # earlier Tcl versions, we keep the following block as a reference.
@@ -371,21 +378,21 @@
 	NSF_BUILD_STUB_LIB_SPEC=""
 	NSF_STUB_LIB_SPEC=""
 else
-	NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-	NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-	NSF_BUILD_STUB_LIB_SPEC="-L`pwd` -lnsfstub${PACKAGE_VERSION}"
-	NSF_STUB_LIB_SPEC="-L${pkglibdir} -lnsfstub${PACKAGE_VERSION}"
+	NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+	NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
+	NSF_BUILD_STUB_LIB_SPEC="-L${NSF_SRC_DIR} -lnsfstub${PACKAGE_VERSION}"
+	NSF_STUB_LIB_SPEC="-L${NSF_PKG_LIBDIR} -lnsfstub${PACKAGE_VERSION}"
 	AC_DEFINE([COMPILE_NSF_STUBS])
 fi
 
 else
 
-NSF_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}"
-NSF_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}"
-NSF_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}"
-NSF_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}"
-NSF_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}"
-NSF_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_LIB_SPEC="${NSF_SRC_DIR}/${PKG_LIB_FILE}"
+NSF_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_LIB_FILE}"
+NSF_BUILD_STUB_LIB_PATH="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_PATH="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
+NSF_BUILD_STUB_LIB_SPEC="${NSF_SRC_DIR}/${PKG_STUB_LIB_FILE}"
+NSF_STUB_LIB_SPEC="${NSF_PKG_LIBDIR}/${PKG_STUB_LIB_FILE}"
 
 fi
 
@@ -397,8 +404,6 @@
 AC_SUBST([NSF_STUB_LIB_SPEC])
 AC_SUBST([NSF_BUILD_STUB_LIB_PATH])
 AC_SUBST([NSF_STUB_LIB_PATH])
-NSF_SRC_DIR=$srcdir
-AC_SUBST([NSF_SRC_DIR])
 AC_SUBST([NXSH])
 AC_SUBST([XOWISH])
 
@@ -408,6 +413,10 @@
 AC_SUBST([NSF_BUILD_INCLUDE_DIR])
 AC_SUBST([NSF_BUILD_INCLUDE_SPEC])
 
+
+eval "NSF_INCLUDE_DIR=\"$includedir\""
+AC_SUBST([NSF_INCLUDE_DIR])
+
 AC_SUBST([test_actiweb])
 AC_SUBST([libdirs_actiweb])
 AC_SUBST([apps_actiweb])
Index: nsfConfig.sh.in
===================================================================
diff -u -N -rb03af92ee24792b6ea79e8d7ff39a3571997f975 -rc1c507da2c410901059af0ecafdb45ab4ae325a4
--- nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision b03af92ee24792b6ea79e8d7ff39a3571997f975)
+++ nsfConfig.sh.in	(.../nsfConfig.sh.in)	(revision c1c507da2c410901059af0ecafdb45ab4ae325a4)
@@ -22,8 +22,8 @@
 
 # String to pass to compiles to pick up the nsf includes from their
 # installed directory.
-NSF_INCLUDE_DIR="@pkgincludedir@"
-NSF_INCLUDE_SPEC="-I$NSF_INCLUDE_DIR"
+NSF_INCLUDE_DIR="@NSF_INCLUDE_DIR@"
+NSF_INCLUDE_SPEC="-I${NSF_INCLUDE_DIR}"
 
 # The name of the nsf library (may be either a .a file or a shared library):
 NSF_LIB_FILE=@PKG_LIB_FILE@
@@ -36,18 +36,18 @@
 # installed directory.
 NSF_LIB_SPEC='@NSF_LIB_SPEC@'
 
-# The name of the XOTcl stub library (a .a file):
+# The name of the NSF stub library (a .a file):
 # NSF_STUB_LIB_FILE=@PKG_STUB_LIB_FILE@
 
-# String to pass to linker to pick up the XOTcl stub library from its
+# 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@'
 
-# String to pass to linker to pick up the XOTcl stub library from its
+# 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 xotcl stub library with full path in build and install directory
+# 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_STUB_LIB_PATH='@NSF_STUB_LIB_PATH@'