diff --git a/.gitignore b/.gitignore
index 1df4cee1..52af3358 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,3 +140,6 @@ doc/latexfiles/psfiles/
 doc/latexfiles/*.dvi
 doc/latexfiles/*.aux
 doc/latexfiles/*.log
+
+# Out-of-tree build directory (generated; was accidentally committed in e7fd0e90)
+/build-alt/
diff --git a/Makefile.in b/Makefile.in
index 82050fc2..186be73c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,9 +178,9 @@ clean:
 distclean:
 	touch defs.mak
 	@${MAKE} clean
-	# NB: do NOT remove rules.mak here.  In-tree (build == source) it is the
-	# tracked source file, not a generated one; out-of-tree the build dir is
-	# disposable, so leaving its generated copy is harmless.
+	# rules.mak is no longer copied into the build top (subdir Makefiles include
+	# ${MAGICSRC}/rules.mak straight from the source tree), so there is nothing to
+	# remove for it here; defs.mak is the only generated make fragment.
 	${RM} defs.mak old.defs.mak
 	${RM} scripts/makedbh scripts/default.conf
 	${RM} config.log config.status
diff --git a/bplane/Makefile.in b/bplane/Makefile.in
index 7460316f..ca14110d 100644
--- a/bplane/Makefile.in
+++ b/bplane/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS	  = bpDump.c bpUtils.c bpBins.c bpEnum.c bpMain.c bpStat.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/calma/Makefile.in b/calma/Makefile.in
index 88a0c29e..4109a27c 100644
--- a/calma/Makefile.in
+++ b/calma/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS =      CalmaRead.c CalmaRdcl.c CalmaRdio.c CalmaRdpt.c CalmaWrite.c CalmaWriteZ.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/cif/Makefile.in b/cif/Makefile.in
index a907a8ef..b3d0163d 100644
--- a/cif/Makefile.in
+++ b/cif/Makefile.in
@@ -12,4 +12,4 @@ SRCS     =  CIFgen.c CIFhier.c CIFmain.c CIFrdcl.c CIFrdpt.c CIFrdpoly.c \
             CIFrdtech.c CIFrdutils.c CIFsee.c CIFtech.c CIFwrite.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/cmwind/Makefile.in b/cmwind/Makefile.in
index 0678a11d..8562ac12 100644
--- a/cmwind/Makefile.in
+++ b/cmwind/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS     =  CMWmain.c CMWcmmnds.c CMWundo.c CMWrgbhsv.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/commands/Makefile.in b/commands/Makefile.in
index fbb250fe..938f5bcc 100644
--- a/commands/Makefile.in
+++ b/commands/Makefile.in
@@ -21,4 +21,4 @@ ${MAGICDIR}/readline/readline:
 	${MAKE} -C ${MAGICDIR}/readline readline-create-symlinks
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/database/Makefile.in b/database/Makefile.in
index 5093954e..0ae4e842 100644
--- a/database/Makefile.in
+++ b/database/Makefile.in
@@ -34,4 +34,4 @@ LIB_OBJS += ${MAGICDIR}/tiles/libtiles.o ${MAGICDIR}/utils/libutils.o
 database.h: ${MAGICSRC}/database/database.h.in
 	${MAKE} -C ${MAGICDIR} $(patsubst ${MAGICDIR}/%,%,${DATABASE_H})
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/dbwind/Makefile.in b/dbwind/Makefile.in
index c83c2ac8..fb6bf3c8 100644
--- a/dbwind/Makefile.in
+++ b/dbwind/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = DBWcommands.c DBWdisplay.c DBWbuttons.c DBWelement.c \
 	    DBWfdback.c DBWhlights.c DBWprocs.c DBWtools.c DBWundo.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/debug/Makefile.in b/debug/Makefile.in
index 1c0f0b36..85cad4c7 100644
--- a/debug/Makefile.in
+++ b/debug/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = debugFlags.c hist.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/drc/Makefile.in b/drc/Makefile.in
index 98052098..31b78eb2 100644
--- a/drc/Makefile.in
+++ b/drc/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = DRCarray.c DRCbasic.c DRCcif.c DRCcontin.c DRCmain.c \
 	    DRCsubcell.c DRCtech.c DRCprint.c DRCextend.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/ext2sim/Makefile.in b/ext2sim/Makefile.in
index ee926b7d..96599329 100644
--- a/ext2sim/Makefile.in
+++ b/ext2sim/Makefile.in
@@ -48,4 +48,4 @@ $(DESTDIR)${INSTALL_TCLDIR}/exttosim${SHDLIB_EXT}: exttosim${SHDLIB_EXT}
 	${RM} $(DESTDIR)${INSTALL_TCLDIR}/exttosim${SHDLIB_EXT}
 	${CP} exttosim${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/exttosim${SHDLIB_EXT}
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/ext2spice/Makefile.in b/ext2spice/Makefile.in
index ff83f86f..3ddcbe47 100644
--- a/ext2spice/Makefile.in
+++ b/ext2spice/Makefile.in
@@ -48,4 +48,4 @@ $(DESTDIR)${INSTALL_BINDIR}/spice2sim: spice2sim
 	${RM} $(DESTDIR)${INSTALL_BINDIR}/spice2sim
 	${CP} $< $(DESTDIR)${INSTALL_BINDIR}/spice2sim
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/extcheck/Makefile.in b/extcheck/Makefile.in
index 5dd3a758..f016ab00 100644
--- a/extcheck/Makefile.in
+++ b/extcheck/Makefile.in
@@ -23,4 +23,4 @@ install: $(DESTDIR)${BINDIR}/${MODULE}${EXEEXT}
 install-tcl:
 	echo "Nothing to do here"
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/extflat/Makefile.in b/extflat/Makefile.in
index 59e234f5..0820e318 100644
--- a/extflat/Makefile.in
+++ b/extflat/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = EFargs.c EFbuild.c EFdef.c EFerr.c EFflat.c EFhier.c EFname.c \
             EFread.c EFsym.c EFvisit.c EFantenna.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/extract/Makefile.in b/extract/Makefile.in
index 9160aa2b..18081ae5 100644
--- a/extract/Makefile.in
+++ b/extract/Makefile.in
@@ -14,4 +14,4 @@ SRCS      = ExtArray.c ExtBasic.c ExtCell.c ExtCouple.c ExtHard.c \
             ExtInter.c ExtUnique.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/garouter/Makefile.in b/garouter/Makefile.in
index 0f93a7e9..b0e7f440 100644
--- a/garouter/Makefile.in
+++ b/garouter/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = gaChannel.c gaMain.c gaMaze.c gaSimple.c gaStem.c \
             gaTest.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/gcr/Makefile.in b/gcr/Makefile.in
index 1c413792..88a8e21c 100644
--- a/gcr/Makefile.in
+++ b/gcr/Makefile.in
@@ -13,4 +13,4 @@ SRCS      = gcrChannel.c gcrColl.c gcrDebug.c gcrEdge.c gcrFeas.c \
             gcrUnsplit.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/graphics/Makefile.in b/graphics/Makefile.in
index a104b518..a2625751 100644
--- a/graphics/Makefile.in
+++ b/graphics/Makefile.in
@@ -82,4 +82,4 @@ fonts: ${OUTLINE_FONTS}
 	${RM} $(DESTDIR)${INSTALL_SYSDIR}/$$i; \
 	${CP} $(srcdir)/$$i $(DESTDIR)${INSTALL_SYSDIR}; done
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/grouter/Makefile.in b/grouter/Makefile.in
index 8f152dc3..4d0c3999 100644
--- a/grouter/Makefile.in
+++ b/grouter/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = grouteChan.c grouteCrss.c grouteDens.c grouteMain.c \
             grouteMult.c grouteMaze.c groutePath.c groutePen.c grouteTest.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/irouter/Makefile.in b/irouter/Makefile.in
index b9a54861..384003fd 100644
--- a/irouter/Makefile.in
+++ b/irouter/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = irCommand.c irMain.c irRoute.c irTestCmd.c irUtils.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/lef/Makefile.in b/lef/Makefile.in
index e409b23c..64549b44 100644
--- a/lef/Makefile.in
+++ b/lef/Makefile.in
@@ -32,4 +32,4 @@ $(DESTDIR)${INSTALL_TCLDIR}/magiclef${SHDLIB_EXT}: magiclef${SHDLIB_EXT}
 	${RM} $(DESTDIR)${INSTALL_TCLDIR}/magiclef${SHDLIB_EXT}
 	${CP} magiclef${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/magiclef${SHDLIB_EXT}
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9816f644..4a07730b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -37,4 +37,4 @@ $(DESTDIR)${INSTALL_SCMDIR}/%: scm/%
 	test -d "$(DESTDIR)$(INSTALL_SCMDIR)" || mkdir -p "$(DESTDIR)$(INSTALL_SCMDIR)"
 	${CP} scm/$* $(DESTDIR)$(INSTALL_SCMDIR)/$*
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/magic/Makefile.in b/magic/Makefile.in
index 88523e3a..87baa5c8 100644
--- a/magic/Makefile.in
+++ b/magic/Makefile.in
@@ -112,7 +112,7 @@ $(DESTDIR)${INSTALL_SYSDIR}/magicps.pro: magicps.pro
 	${RM} $(DESTDIR)${INSTALL_SYSDIR}/magicps.pro
 	${CP} $< $(DESTDIR)${INSTALL_SYSDIR}/magicps.pro
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
 
 ifeq (${MAKE_WASM},1)
 # rules.mak defines `${MODULE}` (= `magic`) with a recipe that links a native
diff --git a/mzrouter/Makefile.in b/mzrouter/Makefile.in
index 20ff75e9..9a2893e5 100644
--- a/mzrouter/Makefile.in
+++ b/mzrouter/Makefile.in
@@ -14,4 +14,4 @@ SRCS      = mzBlock.c mzDebug.c mzEstimate.c mzXtndDown.c \
             mzWalk.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/net2ir/Makefile.in b/net2ir/Makefile.in
index 76599bae..598fb230 100644
--- a/net2ir/Makefile.in
+++ b/net2ir/Makefile.in
@@ -24,4 +24,4 @@ install: $(DESTDIR)${INSTALL_BINDIR}/${MODULE}${EXEEXT}
 install-tcl:
 	echo "Nothing to do here"
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/netmenu/Makefile.in b/netmenu/Makefile.in
index da891a45..b825821d 100644
--- a/netmenu/Makefile.in
+++ b/netmenu/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = NMbutton.c NMcmdAK.c NMcmdLZ.c NMlabel.c NMmain.c \
             NMnetlist.c NMshowpt.c NMshowcell.c NMundo.c NMwiring.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/oa/Makefile.in b/oa/Makefile.in
index 6df9a615..a2ea1ea8 100644
--- a/oa/Makefile.in
+++ b/oa/Makefile.in
@@ -48,4 +48,4 @@ module-clean:
 	${RM} -r .deps
 
 #------------------------------------------------------
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/plot/Makefile.in b/plot/Makefile.in
index a12cc92f..80696852 100644
--- a/plot/Makefile.in
+++ b/plot/Makefile.in
@@ -38,4 +38,4 @@ $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}: tclplot${SHDLIB_EXT}
 	${RM} $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}
 	${CP} tclplot${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/plow/Makefile.in b/plow/Makefile.in
index c308049b..1f4cf96b 100644
--- a/plow/Makefile.in
+++ b/plow/Makefile.in
@@ -13,4 +13,4 @@ SRCS      = PlowCmd.c PlowJogs.c PlowMain.c PlowQueue.c PlowRandom.c \
             PlowTest.c PlowWidth.c PlowYank.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/resis/Makefile.in b/resis/Makefile.in
index a48f3dc0..f77487a9 100644
--- a/resis/Makefile.in
+++ b/resis/Makefile.in
@@ -13,4 +13,4 @@ SRCS      = ResMain.c ResJunct.c ResMakeRes.c ResSimple.c ResPrint.c \
             ResFract.c ResUtils.c ResDebug.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/router/Makefile.in b/router/Makefile.in
index 2c88cc9b..87ec8621 100644
--- a/router/Makefile.in
+++ b/router/Makefile.in
@@ -38,4 +38,4 @@ $(DESTDIR)${TCLDIR}/tclroute${SHDLIB_EXT}: tclroute${SHDLIB_EXT}
 	${RM} $(DESTDIR)${TCLDIR}/tclroute${SHDLIB_EXT}
 	${CP} tclroute${SHDLIB_EXT} $(DESTDIR)${TCLDIR}/tclroute${SHDLIB_EXT}
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/scripts/configure b/scripts/configure
index ee87858e..03985755 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -9396,8 +9396,6 @@ ac_config_files="$ac_config_files defs.mak:scripts/defs.mak.in"
 
 ac_config_files="$ac_config_files scripts/makedbh:scripts/makedbh.in"
 
-ac_config_files="$ac_config_files rules.mak:rules.mak"
-
 
 ac_config_files="$ac_config_files tiles/Makefile:tiles/Makefile.in"
 
@@ -10217,7 +10215,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in" ;;
     "defs.mak") CONFIG_FILES="$CONFIG_FILES defs.mak:scripts/defs.mak.in" ;;
     "scripts/makedbh") CONFIG_FILES="$CONFIG_FILES scripts/makedbh:scripts/makedbh.in" ;;
-    "rules.mak") CONFIG_FILES="$CONFIG_FILES rules.mak:rules.mak" ;;
     "tiles/Makefile") CONFIG_FILES="$CONFIG_FILES tiles/Makefile:tiles/Makefile.in" ;;
     "bplane/Makefile") CONFIG_FILES="$CONFIG_FILES bplane/Makefile:bplane/Makefile.in" ;;
     "calma/Makefile") CONFIG_FILES="$CONFIG_FILES calma/Makefile:calma/Makefile.in" ;;
diff --git a/scripts/configure.in b/scripts/configure.in
index 73c7328d..44709934 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -1998,10 +1998,9 @@ dnl under build/scripts/ (matching ${SCRIPTS}/makedbh = ${MAGICDIR}/scripts).
 AC_CONFIG_FILES([Makefile:Makefile.in])
 AC_CONFIG_FILES([defs.mak:scripts/defs.mak.in])
 AC_CONFIG_FILES([scripts/makedbh:scripts/makedbh.in], [chmod +x scripts/makedbh])
-dnl Copy rules.mak into the build top (it has no @...@ substitutions; this just
-dnl places it next to the generated defs.mak so a single ${MAGICDIR} resolves
-dnl both `include`s in every subdir Makefile out-of-tree).
-AC_CONFIG_FILES([rules.mak:rules.mak])
+dnl rules.mak is included straight from the source tree (${MAGICSRC}/rules.mak),
+dnl so it is NOT copied into the build top.  Only defs.mak (which has @...@
+dnl substitutions) is generated there.
 
 dnl Per-module Makefiles (Makefile.in migration).  Each converted module lists
 dnl its Makefile here; config.status creates the build subdir and the Makefile.
diff --git a/select/Makefile.in b/select/Makefile.in
index 1ef4ff36..9cd7aec3 100644
--- a/select/Makefile.in
+++ b/select/Makefile.in
@@ -12,4 +12,4 @@ SRCS      = selCreate.c selDisplay.c selEnum.c selOps.c selUndo.c \
             selUnselect.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/sim/Makefile.in b/sim/Makefile.in
index d1174403..ab54452f 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = SimDBstuff.c SimSelect.c SimRsim.c SimExtract.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/tcltk/Makefile.in b/tcltk/Makefile.in
index ddaa4f99..22ab060d 100644
--- a/tcltk/Makefile.in
+++ b/tcltk/Makefile.in
@@ -117,4 +117,4 @@ $(DESTDIR)${INSTALL_BINDIR}/ext2sim.sh: ext2sim.sh
 # An additional dependency on the VERSION file
 ${OBJS}: ${MAGICSRC}/VERSION
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/textio/Makefile.in b/textio/Makefile.in
index f9bc7440..ca3a90c6 100644
--- a/textio/Makefile.in
+++ b/textio/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = txCommands.c txInput.c txMain.c txMore.c txOutput.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/tiles/Makefile.in b/tiles/Makefile.in
index ce120b67..978e62ba 100644
--- a/tiles/Makefile.in
+++ b/tiles/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = tile.c search.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 413ad3e9..18a6c232 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -22,4 +22,4 @@ include ${MAGICDIR}/defs.mak
 DFLAGS += ${GR_DFLAGS}
 CFLAGS += ${GR_CFLAGS}
 
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
diff --git a/windows/Makefile.in b/windows/Makefile.in
index 3aba162f..2774ea2f 100644
--- a/windows/Makefile.in
+++ b/windows/Makefile.in
@@ -16,7 +16,7 @@ GLYPHS    = windows7.glyphs windows11.glyphs windows14.glyphs windows22.glyphs
 FONTS	  = vfont.B.12 vfont.I.12 vfont.R.8
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak
 
 install-tcl:
 	@echo --- installing glyphs to $(DESTDIR)${INSTALL_SYSDIR}
diff --git a/wiring/Makefile.in b/wiring/Makefile.in
index 9e42d107..f92c3775 100644
--- a/wiring/Makefile.in
+++ b/wiring/Makefile.in
@@ -11,4 +11,4 @@ MAGICDIR  = @top_builddir@
 SRCS      = wireOps.c wireTech.c wireUndo.c
 
 include ${MAGICDIR}/defs.mak
-include ${MAGICDIR}/rules.mak
+include ${MAGICSRC}/rules.mak