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

build: nested-child Makefile.in use @srcdir@ 

Switch the 5 nested children (scmos/cif_template, doc/man, doc/tutcells,
doc/html, doc/latexfiles) to configure-provided substitution:
  srcdir   = @srcdir@
  VPATH    = @srcdir@
  MAGICDIR = @top_builddir@   (resolves to ../.. for these nested dirs)

Verified out-of-tree: full `make` rc=0; cif_template gets
srcdir=<src>/scmos/cif_template, doc/latexfiles MAGICDIR=../..; scmos
techs + 27/28 docs build.

With this, every module except readline/ is a configure-generated
Makefile.in using @srcdir@ substitution.

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

7
doc/html/Makefile.in
View File

@ -1,5 +1,8 @@
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 include $(MAGICDIR)/defs.mak
HTML_INSTDIR=$(INSTALL_LIBDIR)/magic/doc/html HTML_INSTDIR=$(INSTALL_LIBDIR)/magic/doc/html

7
doc/latexfiles/Makefile.in
View File

@ -1,5 +1,8 @@
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 include $(MAGICDIR)/defs.mak
# PS_SRCDIR: pre-built PostScript shipped in the source tree (read-only, used by # PS_SRCDIR: pre-built PostScript shipped in the source tree (read-only, used by

7
doc/man/Makefile.in
View File

@ -2,8 +2,11 @@
# makefile for Magic documentation # 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@
MANMACS= tmac.anc MANMACS= tmac.anc
TROFF=ditroff -h TROFF=ditroff -h
TTROFF=ditroff -Ppsc -t TTROFF=ditroff -Ppsc -t

7
doc/tutcells/Makefile.in
View File

@ -2,8 +2,11 @@
# makefile for Magic documentation # 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@
include ${MAGICDIR}/defs.mak include ${MAGICDIR}/defs.mak
TUTDIR = ${INSTALL_LIBDIR}/magic/tutorial TUTDIR = ${INSTALL_LIBDIR}/magic/tutorial

7
scmos/cif_template/Makefile.in
View File

@ -1,5 +1,8 @@
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@
MKDIR = $(MAGICSRC)/scripts/mkdirs MKDIR = $(MAGICSRC)/scripts/mkdirs
OBJS_DIR = objs OBJS_DIR = objs
CIFIN = $(OBJS_DIR)/CIFin CIFIN = $(OBJS_DIR)/CIFin