Index: configure
===================================================================
diff -u -r4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1 -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8
--- configure	(.../configure)	(revision 4619c8c851c573ae6876375f8e7fdd9d9ffaa3a1)
+++ configure	(.../configure)	(revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8)
@@ -5558,12 +5558,8 @@
 # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
+stubdir=stubs${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
 
-echo "==================== put version-specific stub files in place (needed for Tcl 8.6)"
-make getstubs
-echo "==================== getstubs done"
-
-
     vars="nsf.c nsfError.c nsfObjectData.c nsfProfile.c \
 	nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c nsfEnumerationType.c \
         nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c"
@@ -5601,7 +5597,7 @@
 
 
 
-    vars="generic/nsf.h generic/nsfInt.h generic/nsfDecls.h generic/nsfIntDecls.h"
+    vars="generic/nsf.h generic/nsfInt.h generic/${stubdir}/nsfDecls.h generic/${stubdir}/nsfIntDecls.h"
     for i in $vars; do
 	# check for existence, be strict because it is installed
 	if test ! -f "${srcdir}/$i" ; then