janware/jw-pkg
1
Code Pull requests Activity Actions

Improve Python config file template substitution #8

Merged
Jan Lindemann merged 10 commits from jan/feature/20260609-pyproject-toml-add-mypypath into master 2026-06-09 08:13:09 +02:00 AGit
Conversation 0 Commits 10 Files changed 7 +5
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7396794122 - Show all commits

conf/templates: Add subdir

Prev Next 
Add $(TOPDIR)/conf/templates as a location for templates, i.e. input files to the CmdCreateFile template rendering command.
Signed-off-by: Jan Lindemann <jan@janware.com>
Jan Lindemann 2026-06-02 20:52:37 +02:00
commit 7396794122
Signed by: Jan Lindemann
GPG key ID: 3750640C9E25DD61

4
conf/templates/Makefile Normal file
View file

@ -0,0 +1,4 @@
TOPDIR = ../..
include $(TOPDIR)/make/proj.mk
include $(JWBDIR)/make/dirs.mk

1
make/defs.mk
View file

@ -264,6 +264,7 @@ CVS_RSH ?= /usr/bin/ssh
JW_PKG_DIR = $(JWBDIR)
JW_PKG_CONF_BASE_DIR ?= $(firstword $(wildcard $(JW_PKG_DIR)/conf /etc/opt/jw-pkg))
JW_PKG_CONF_DIR ?= $(firstword $(wildcard $(JW_PKG_CONF_BASE_DIR)/project $(JW_PKG_CONF_BASE_DIR)))
JW_PKG_TMPL_DIR ?= $(JW_PKG_CONF_BASE_DIR)/templates
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
# only works if checked out true to CVS, i.e. below proj