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])