--- tcl-work/tcl/unix/Makefile.in	2021-04-29 06:29:56.000000000 -0700
+++ test dir/tcl/unix/Makefile.in	2021-04-29 10:20:09.000000000 -0700
@@ -224,22 +224,21 @@
 RANLIB			= @RANLIB@
 DTRACE			= @DTRACE@
 SRC_DIR			= @srcdir@
-TOP_DIR			= @TCL_SRC_DIR@
 BUILD_DIR		= @builddir@
-GENERIC_DIR		= $(TOP_DIR)/generic
-COMPAT_DIR		= $(TOP_DIR)/compat
-TOOL_DIR		= $(TOP_DIR)/tools
-UNIX_DIR		= $(TOP_DIR)/unix
-MAC_OSX_DIR		= $(TOP_DIR)/macosx
-PKGS_DIR		= $(TOP_DIR)/pkgs
+GENERIC_DIR		= ../generic
+COMPAT_DIR		= ../compat
+TOOL_DIR		= ../tools
+UNIX_DIR		= ../unix
+MAC_OSX_DIR		= ../macosx
+PKGS_DIR		= ../pkgs
 # Must be absolute because of the cd dltest $(DLTEST_DIR)/configure below.
-DLTEST_DIR		= @TCL_SRC_DIR@/unix/dltest
+DLTEST_DIR		= ../unix/dltest
 # Must be absolute to so the corresponding tcltest's tcl_library is absolute.
-TCL_BUILDTIME_LIBRARY	= @TCL_SRC_DIR@/library
+TCL_BUILDTIME_LIBRARY	= ../library
 
 ZLIB_DIR		= ${COMPAT_DIR}/zlib
 ZLIB_INCLUDE		= @ZLIB_INCLUDE@
-TOMMATH_DIR		= $(TOP_DIR)/libtommath
+TOMMATH_DIR		= ../libtommath
 
 CC			= @CC@
 #CC			= purify -best-effort @CC@ -DPURIFY
@@ -679,7 +678,7 @@
 	$(MAC_OSX_DIR)/tclMacOSXNotify.c
 
 CYGWIN_SRCS = \
-	$(TOP_DIR)/win/tclWinError.c
+	../win/tclWinError.c
 
 DTRACE_HDR = tclDTrace.h
 
@@ -725,7 +724,7 @@
 
 ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
 	@if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
-	    (cd ${TOP_DIR}/win; ${MAKE} winextensions); \
+	    (cd ../win; ${MAKE} winextensions); \
 	fi
 	rm -f $@
 	@MAKE_STUB_LIB@
@@ -777,7 +776,7 @@
 
 .NO_PARALLEL: topDirName
 topDirName:
-	@cd $(TOP_DIR); pwd
+	@cd ..; pwd
 
 #--------------------------------------------------------------------------
 # Rules for testing
@@ -810,12 +809,12 @@
 test: test-tcl test-packages
 
 test-tcl: ${TCLTEST_EXE}
-	$(SHELL_ENV) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
+	$(SHELL_ENV) ./${TCLTEST_EXE} ../tests/all.tcl $(TESTFLAGS)
 
 gdb-test: ${TCLTEST_EXE}
 	@echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run
 	@echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
-	@echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run
+	@echo "set args ../tests/all.tcl $(TESTFLAGS) -singleproc 1" >> gdb.run
 	$(GDB) ./${TCLTEST_EXE} --command=gdb.run
 	rm gdb.run
 
@@ -852,7 +851,7 @@
 
 valgrind: ${TCL_EXE} ${TCLTEST_EXE}
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \
-		$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
+		../tests/all.tcl -singleproc 1 -constraints valgrind \
 		$(TESTFLAGS)
 
 valgrindshell: ${TCL_EXE}
@@ -862,7 +861,7 @@
 	$(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCL_EXE} $(SCRIPT)
 
 trace-test: ${TCLTEST_EXE}
-	$(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS)
+	$(SHELL_ENV) ${TRACE} $(TRACE_OPTS) ./${TCLTEST_EXE} ../tests/all.tcl -singleproc 1 $(TESTFLAGS)
 
 #--------------------------------------------------------------------------
 # Installation rules
@@ -936,39 +935,39 @@
 		fi; \
 	    done;
 	@echo "Installing library files to $(SCRIPT_INSTALL_DIR)/";
-	@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \
+	@for i in ../library/*.tcl ../library/tclIndex \
 		$(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
 	    done;
 	@echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
-	@for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
+	@for i in ../library/http1.0/*.tcl ; \
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done
 	@echo "Installing package http 2.9.5 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
+	@$(INSTALL_DATA) ../library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.9.5.tm"
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
-	@for i in $(TOP_DIR)/library/opt/*.tcl; do \
+	@for i in ../library/opt/*.tcl; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
 	done
 	@echo "Installing package msgcat 1.6.1 as a Tcl Module"
-	@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
+	@$(INSTALL_DATA) ../library/msgcat/msgcat.tcl \
 		"$(MODULE_INSTALL_DIR)/8.5/msgcat-1.6.1.tm"
 	@echo "Installing package tcltest 2.5.3 as a Tcl Module"
-	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl \
+	@$(INSTALL_DATA) ../library/tcltest/tcltest.tcl \
 		"$(MODULE_INSTALL_DIR)/8.5/tcltest-2.5.3.tm"
 	@echo "Installing package platform 1.0.17 as a Tcl Module"
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl \
+	@$(INSTALL_DATA) ../library/platform/platform.tcl \
 		"$(MODULE_INSTALL_DIR)/8.4/platform-1.0.17.tm"
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module"
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl \
+	@$(INSTALL_DATA) ../library/platform/shell.tcl \
 		"$(MODULE_INSTALL_DIR)/8.4/platform/shell-1.1.4.tm"
 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"
-	@for i in $(TOP_DIR)/library/encoding/*.enc; do \
+	@for i in ../library/encoding/*.enc; do \
 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/encoding"; \
 	done
-	@if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ] ; then \
+	@if [ -n "$(TCL_MODULE_PATH)" -a -f ../library/tm.tcl ] ; then \
 	    echo "Customizing tcl module path"; \
 	    echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \
 	        "$(SCRIPT_INSTALL_DIR)/tm.tcl"; \
@@ -982,7 +981,7 @@
 	    fi; \
 	done
 	@echo "Installing time zone files to $(SCRIPT_INSTALL_DIR)/tzdata/"
-	@for i in $(TOP_DIR)/library/tzdata/*; do \
+	@for i in ../library/tzdata/*; do \
 	    if [ -d $$i ] ; then \
 		ii=`basename $$i`; \
 		if [ ! -d "$(SCRIPT_INSTALL_DIR)/tzdata/$$ii" ] ; then \
@@ -1014,7 +1013,7 @@
 	    fi; \
 	done
 	@echo "Installing message catalog files to $(SCRIPT_INSTALL_DIR)/msgs/"
-	@for i in $(TOP_DIR)/library/msgs/*.msg; do \
+	@for i in ../library/msgs/*.msg; do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/msgs"; \
 	done
 
@@ -1026,15 +1025,15 @@
 	    fi; \
 	done
 	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/"
-	@for i in $(TOP_DIR)/doc/*.1; do \
+	@for i in ../doc/*.1; do \
 	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
 	done
 	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/"
-	@for i in $(TOP_DIR)/doc/*.3; do \
+	@for i in ../doc/*.3; do \
 	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
 	done
 	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
-	@for i in $(TOP_DIR)/doc/*.n; do \
+	@for i in ../doc/*.n; do \
 	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
 	done
 
@@ -1682,8 +1681,8 @@
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tclMacOSXNotify.c
 
 # The following is a CYGWIN only source:
-tclWinError.o: $(TOP_DIR)/win/tclWinError.c
-	$(CC) -c $(CC_SWITCHES) $(TOP_DIR)/win/tclWinError.c
+tclWinError.o: ../win/tclWinError.c
+	$(CC) -c $(CC_SWITCHES) ../win/tclWinError.c
 
 # DTrace support
 
@@ -1978,7 +1977,7 @@
 	-@for i in `nm -p $(TCL_LIB_FILE) | awk '$$3 ~ /Tcl_/ { print $$3 }' \
 		| grep -v 'Cmd$$' | sort -n`; do \
 	    match=0; \
-	    for j in $(TOP_DIR)/doc/*.3; do \
+	    for j in ../doc/*.3; do \
 		if [ `grep '\-' $$j | grep -c $$i` -gt 0 ]; then \
 		    match=1; \
 		fi; \
@@ -2044,14 +2043,14 @@
 $(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-$(TOP_DIR)/manifest.uuid:
-	printf "git." >$(TOP_DIR)/manifest.uuid
-	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
+../manifest.uuid:
+	printf "git." >../manifest.uuid
+	git rev-parse HEAD >>../manifest.uuid
 
-dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/manifest.uuid genstubs dist-packages ${NATIVE_TCLSH}
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure ../manifest.uuid genstubs dist-packages ${NATIVE_TCLSH}
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
-	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
+	cp -p ../manifest.uuid $(DISTDIR)
 	cp -p $(UNIX_DIR)/*.[ch] $(DISTDIR)/unix
 	cp -p $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
 	chmod 664 $(DISTDIR)/unix/Makefile.in
@@ -2069,30 +2068,30 @@
 	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
 	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
 	cp -p $(GENERIC_DIR)/tclGetDate.y $(DISTDIR)/generic
-	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog $(TOP_DIR)/README.md \
-		$(TOP_DIR)/ChangeLog.[12]??? $(TOP_DIR)/license.terms \
+	cp -p ../changes ../ChangeLog ../README.md \
+		../ChangeLog.[12]??? ../license.terms \
 		$(DISTDIR)
 	@mkdir $(DISTDIR)/library
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
-		$(TOP_DIR)/library/tclIndex $(DISTDIR)/library
+	cp -p ../license.terms ../library/*.tcl \
+		../library/tclIndex $(DISTDIR)/library
 	@for i in http1.0 http opt msgcat reg dde tcltest platform; do \
 	    mkdir $(DISTDIR)/library/$$i;\
-	    cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
+	    cp -p ../library/$$i/*.tcl $(DISTDIR)/library/$$i; \
 	done
 	@mkdir $(DISTDIR)/library/encoding
-	cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
+	cp -p ../library/encoding/*.enc $(DISTDIR)/library/encoding
 	@mkdir $(DISTDIR)/library/msgs
-	cp -p $(TOP_DIR)/library/msgs/*.msg $(DISTDIR)/library/msgs
-	@echo cp -r $(TOP_DIR)/library/tzdata $(DISTDIR)/library/tzdata
-	@( cd $(TOP_DIR); \
+	cp -p ../library/msgs/*.msg $(DISTDIR)/library/msgs
+	@echo cp -r ../library/tzdata $(DISTDIR)/library/tzdata
+	@( cd ..; \
 	  find library/tzdata -name CVS -prune -o -type f -print ) \
-	    | ( cd $(TOP_DIR) ; xargs tar cf - ) \
+	    | ( cd .. ; xargs tar cf - ) \
 	    | ( cd $(DISTDIR) ; tar xfp - )
 	@mkdir $(DISTDIR)/doc
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
-		$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
+	cp -p ../license.terms ../doc/*.[13n] \
+		../doc/man.macros $(DISTDIR)/doc
 	@mkdir $(DISTDIR)/compat
-	cp -p $(TOP_DIR)/license.terms $(COMPAT_DIR)/*.[ch] \
+	cp -p ../license.terms $(COMPAT_DIR)/*.[ch] \
 		$(COMPAT_DIR)/README $(DISTDIR)/compat
 	@mkdir $(DISTDIR)/compat/zlib
 	@echo cp -r $(COMPAT_DIR)/zlib $(DISTDIR)/compat/zlib
@@ -2101,45 +2100,45 @@
 	    | ( cd $(COMPAT_DIR)/zlib ; xargs tar cf - ) \
 	    | ( cd $(DISTDIR)/compat/zlib ; tar xfp - )
 	@mkdir $(DISTDIR)/tests
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests
-	cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
-		$(TOP_DIR)/tests/httpd $(TOP_DIR)/tests/*.tcl \
+	cp -p ../license.terms $(DISTDIR)/tests
+	cp -p ../tests/*.test ../tests/README \
+		../tests/httpd ../tests/*.tcl \
 		$(DISTDIR)/tests
 	@mkdir $(DISTDIR)/tests/auto0
 	for i in auto1 auto2 ; \
 	    do \
 		mkdir $(DISTDIR)/tests/auto0/$$i ;\
-		cp -p $(TOP_DIR)/tests/auto0/$$i/tclIndex $(TOP_DIR)/tests/auto0/$$i/*.tcl \
+		cp -p ../tests/auto0/$$i/tclIndex ../tests/auto0/$$i/*.tcl \
 			$(DISTDIR)/tests/auto0/$$i; \
 	    done;
 	for i in modules modules/mod1 modules/mod2 ; \
 	    do \
 		mkdir $(DISTDIR)/tests/auto0/$$i ;\
-		cp -p $(TOP_DIR)/tests/auto0/$$i/*.tm \
+		cp -p ../tests/auto0/$$i/*.tm \
 			$(DISTDIR)/tests/auto0/$$i; \
 	    done;
 	@mkdir $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/configure.in $(TOP_DIR)/win/configure \
-		$(TOP_DIR)/win/tclConfig.sh.in $(TOP_DIR)/win/tclooConfig.sh \
-		$(TOP_DIR)/win/tcl.m4 $(TOP_DIR)/win/aclocal.m4 \
-		$(TOP_DIR)/win/tclsh.exe.manifest.in \
+	cp -p ../win/Makefile.in $(DISTDIR)/win
+	cp -p ../win/configure.in ../win/configure \
+		../win/tclConfig.sh.in ../win/tclooConfig.sh \
+		../win/tcl.m4 ../win/aclocal.m4 \
+		../win/tclsh.exe.manifest.in \
 		$(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
+	cp -p ../win/*.[ch] ../win/*.ico ../win/*.rc \
 		$(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.vc $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
+	cp -p ../win/*.bat $(DISTDIR)/win
+	cp -p ../win/*.vc $(DISTDIR)/win
+	cp -p ../win/coffbase.txt $(DISTDIR)/win
+	cp -p ../win/tcl.hpj.in $(DISTDIR)/win
+	cp -p ../win/tcl.ds* $(DISTDIR)/win
+	cp -p ../win/README $(DISTDIR)/win
+	cp -p ../license.terms $(DISTDIR)/win
 	@mkdir $(DISTDIR)/macosx
 	cp -p $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
 		$(MAC_OSX_DIR)/*.c $(MAC_OSX_DIR)/*.in \
 		$(MAC_OSX_DIR)/*.ac $(MAC_OSX_DIR)/*.xcconfig \
 		$(MAC_OSX_DIR)/configure $(DISTDIR)/macosx
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
+	cp -p ../license.terms $(DISTDIR)/macosx
 	@mkdir $(DISTDIR)/macosx/Tcl.xcode
 	cp -p $(MAC_OSX_DIR)/Tcl.xcode/project.pbxproj \
 		$(MAC_OSX_DIR)/Tcl.xcode/default.pbxuser \
@@ -2160,14 +2159,14 @@
 	@mkdir $(DISTDIR)/libtommath
 	cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h $(DISTDIR)/libtommath
 	@mkdir $(DISTDIR)/pkgs
-	cp -p $(TOP_DIR)/pkgs/README $(DISTDIR)/pkgs
-	cp -p $(TOP_DIR)/pkgs/package.list.txt $(DISTDIR)/pkgs
+	cp -p ../pkgs/README $(DISTDIR)/pkgs
+	cp -p ../pkgs/package.list.txt $(DISTDIR)/pkgs
 	for i in `ls $(DISTROOT)/pkgs/*.tar.gz 2> /dev/null`; do \
 	    tar -C $(DISTDIR)/pkgs -xzf "$$i"; \
 	done
-	cp -p $(TOP_DIR)/.travis.yml $(DISTDIR)
+	cp -p ../.travis.yml $(DISTDIR)
 	mkdir -p $(DISTDIR)/.github/workflows
-	cp -p $(TOP_DIR)/.github/workflows/*.yml $(DISTDIR)/.github/workflows
+	cp -p ../.github/workflows/*.yml $(DISTDIR)/.github/workflows
 
 alldist: dist
 	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
@@ -2205,11 +2204,11 @@
 
 # You'd better have these programs or you will have problems creating Makefile
 # from Makefile.in in the first place...
-HTML_VERSION = `basename $(TOP_DIR) | sed s/tcl//`
+HTML_VERSION = `basename .. | sed s/tcl//`
 BUILD_HTML = \
 	@${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
 		--useversion=$(HTML_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
-		--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+		--srcdir=../.. $(BUILD_HTML_FLAGS)
 
 #--------------------------------------------------------------------------
 # The list of all the targets that do not correspond to real files. This stops
