Change the names of the subdirectories tkinter and stdwin to
lib-tk and lib-stdwin.  (BTW this was also done in the previous
checkin of (toplevel)/Makefile.in, though not noted in the checkin
message.)
diff --git a/Modules/Setup.in b/Modules/Setup.in
index 8f9c12b..3eb30c5 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -179,7 +179,7 @@
 #STDWIN=/ufs/guido/src/stdwin
 
 # Uncomment these lines:
-#STDWINPATH=:stdwin
+#STDWINPATH=:lib-stdwin
 #LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a
 #LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a
 #stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11
@@ -263,7 +263,7 @@
 # Change the -l arguments to use Tcl 7.4 and Tk 4.0!
 
 # *** ALWAYS enable this line:
-#TKPATH=:tkinter
+#TKPATH=:lib-tk
 
 # *** Enable *one* of the following lines:
 # For Solaris: