Index: Makefile.in
===================================================================
diff -u -r8ec912177de5c542eb22a9a135d3624322ae20c9 -r8d8e1bacda07426650fc27ae0993409e9106804c
--- Makefile.in	(.../Makefile.in)	(revision 8ec912177de5c542eb22a9a135d3624322ae20c9)
+++ Makefile.in	(.../Makefile.in)	(revision 8d8e1bacda07426650fc27ae0993409e9106804c)
@@ -31,6 +31,7 @@
 TCL_LIB_SPEC		= @TCL_LIB_SPEC@
 subdirs			= @subdirs@
 aol_prefix		= @aol_prefix@
+stubdir                 = stubs${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
 
 # Requires native paths
 PLATFORM_DIR	= `@CYGPATH@ $(srcdir)/@TEA_PLATFORM@`
@@ -697,7 +698,7 @@
 nsfEnumerationType.$(OBJEXT): $(src_generic_dir)/nsfEnumerationType.c $(PKG_HEADERS)
 nsfProfile.$(OBJEXT): $(src_generic_dir)/nsfProfile.c $(PKG_HEADERS)
 nsfShadow.$(OBJEXT): $(src_generic_dir)/nsfShadow.c $(PKG_HEADERS)
-nsfStubInit.$(OBJEXT): $(PKG_HEADERS)
+$(stubdir)/nsfStubInit.$(OBJEXT): $(PKG_HEADERS)
 nsfStubLib.$(OBJEXT): $(src_generic_dir)/nsfStubLib.c $(PKG_HEADERS)
 nsfUtil.$(OBJEXT): $(src_generic_dir)/nsfUtil.c $(PKG_HEADERS)
 
@@ -712,11 +713,11 @@
 	tclsh8.5 $(TCL_SRC_DIR_85)/tools/genStubs.tcl $(src_generic_dir) \
 		$(src_generic_dir)/nsf.decls $(src_generic_dir)/nsfInt.decls
 	mkdir -p $(src_generic_dir)/stubs8.5
-	cp $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.5
+	mv $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.5
 	tclsh8.6 $(TCL_SRC_DIR_86)/tools/genStubs.tcl $(src_generic_dir) \
 		$(src_generic_dir)/nsf.decls $(src_generic_dir)/nsfInt.decls
 	mkdir -p $(src_generic_dir)/stubs8.6
-	cp $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.6
+	mv $(src_generic_dir)/nsfDecls.h $(src_generic_dir)/nsfIntDecls.h $(src_generic_dir)/nsfStubInit.c $(src_generic_dir)/stubs8.6
 
 getstubs:
 	$(TCLSH) $(src_app_dir_native)/utils/getstubs.tcl $(src_generic_dir)
Index: configure
===================================================================
diff -u -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 -r8d8e1bacda07426650fc27ae0993409e9106804c
--- configure	(.../configure)	(revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8)
+++ configure	(.../configure)	(revision 8d8e1bacda07426650fc27ae0993409e9106804c)
@@ -5562,7 +5562,7 @@
 
     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"
+        nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c \${srcdir}/generic/${stubdir}/nsfStubInit.${OBJEXT}"
     for i in $vars; do
 	case $i in
 	    \$*)
Index: configure.ac
===================================================================
diff -u -r8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8 -r8d8e1bacda07426650fc27ae0993409e9106804c
--- configure.ac	(.../configure.ac)	(revision 8c6ae48dc57c62b8f15173f68cb3062ffefc9dd8)
+++ configure.ac	(.../configure.ac)	(revision 8d8e1bacda07426650fc27ae0993409e9106804c)
@@ -221,7 +221,7 @@
 stubdir=stubs${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
 TEA_ADD_SOURCES([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])
+        nsfCmdDefinitions.c nsfShadow.c nsfCompile.c aolstub.c \${srcdir}/generic/${stubdir}/nsfStubInit.${OBJEXT}])
 TEA_ADD_HEADERS([generic/nsf.h generic/nsfInt.h generic/${stubdir}/nsfDecls.h generic/${stubdir}/nsfIntDecls.h])
 TEA_ADD_INCLUDES([])
 TEA_ADD_LIBS([])