luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: magic/tcltk/scmos/doc/lisp Makefile.in use @srcdir@ 

Switch the 5 top-level outlier modules to configure-provided substitution
(same template as the rest):
  srcdir   = @srcdir@
  VPATH    = @srcdir@
  MAGICDIR = @top_builddir@
Their custom rules and ${MAGICDIR}/${MAGICSRC} references keep working:
${MAGICDIR} = @top_builddir@ (build top), $(srcdir) now from @srcdir@.
scmos/doc still recurse into their (static) children via -f.

Verified out-of-tree: full `make` rc=0 -- magic gets srcdir=<src>/magic,
tclmagic.so + scmos techs + 27/28 docs build.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Darryl L. Miles 2026-07-22 18:31:10 +00:00 committed by R. Timothy Edwards
parent 887eca61fe
commit 162db537d8
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/Makefile.in
View File

@ -2,7 +2,11 @@
# makefile for Magic documentation
#
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
PSDIR = psfiles
include ${MAGICDIR}/defs.mak

6
lisp/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = lisp
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = lispMain.c lispEval.c lispPrint.c lispParse.c lispA-Z.c \
lispGC.c lispFrame.c lispTrace.c lispMagic.c lispArith.c \
lispString.c lispIO.c

7
magic/Makefile.in
View File

@ -3,8 +3,11 @@
#
MODULE = magic
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
include ${MAGICDIR}/defs.mak
SRCS = magicTop.c

7
scmos/Makefile.in
View File

@ -13,8 +13,11 @@
#
#######################################################################
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
include ${MAGICDIR}/defs.mak
SC_PP = ${MCPP} -I$(srcdir)/extract_template

6
tcltk/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = tcltk
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = tclmagic.c
OBJS = $(subst .c,.o,${SRCS})