janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

make: Own the top-level project directories in packages #88

Merged
Jan Lindemann merged 2 commits from jan/fix/20260907-make-own-the-top-level-project-directories-in-packages into master 2026-09-07 09:37:34 +02:00 AGit
Conversation 0 Commits 2 Files changed 9 +31 -9
9 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/conf.mk
View file

@ -4,15 +4,26 @@ include $(JWBDIR)/make/dev-utils.mk
all: all:
clean: clean.conf clean: clean.conf
install: install_CFG install_files_SYSCFG install_files_LOGROT install_files_CRONTAB install_files_RSYSLOG \ install: \
install_files_APACHE_CONF install_files_SYSTEMD install_files_INIT install_files_TMPFILES $(CONF_D) $(INSTALL_CFGTOPDIR) \
install_CFG \
install_files_SYSCFG \
install_files_LOGROT \
install_files_CRONTAB \
install_files_RSYSLOG \
install_files_APACHE_CONF \
install_files_SYSTEMD \
install_files_INIT \
install_files_TMPFILES \
$(CONF_D)
test: all test: all
clean.conf: clean.conf:
$(RM) -rf *~ .*.swp *.done $(RM) -rf *~ .*.swp *.done
ifneq ($(CONFIG_SUBDIR),) ifneq ($(INSTALL_CFGTOPDIR),)
$(INSTALLED_CFG): $(INSTALL_CFGDIR) $(INSTALL_CFGTOPDIR):
$(INSTALL) -D -d -m $(CFGTOPDIRMODE) -o $(CFGTOPDIROWNER) -g $(CFGTOPDIRGROUP) $@
endif endif
ifneq ($(CONF_D),) ifneq ($(CONF_D),)

4
make/defs-dev.mk
View file

@ -31,6 +31,7 @@ LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
INSTALL_PREFIXDIR ?= $(PREFIX)
DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data
IMAGEDIR ?= $(DATA_DIR)/images IMAGEDIR ?= $(DATA_DIR)/images
JSON_DIR ?= $(DATA_DIR)/json JSON_DIR ?= $(DATA_DIR)/json
@ -71,6 +72,9 @@ CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
CFGTOPDIROWNER ?= $(CFGDIROWNER)
CFGTOPDIRGROUP ?= $(CFGDIRGROUP)
CFGTOPDIRMODE ?= $(CFGDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER) SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP) SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE) SYSCFGMODE ?= $(CFGMODE)

4
make/defs-dist.mk
View file

@ -31,6 +31,7 @@ LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?= HDR_SCOPE_PREFIX ?=
INSTALL_PREFIXDIR ?= $(PREFIX)
DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data DATA_DIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/data
IMAGEDIR ?= $(DATA_DIR)/images IMAGEDIR ?= $(DATA_DIR)/images
JSON_DIR ?= $(DATA_DIR)/json JSON_DIR ?= $(DATA_DIR)/json
@ -71,6 +72,9 @@ CFGMODE ?= 664
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
CFGTOPDIROWNER ?= $(CFGDIROWNER)
CFGTOPDIRGROUP ?= $(CFGDIRGROUP)
CFGTOPDIRMODE ?= $(CFGDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER) SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP) SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE) SYSCFGMODE ?= $(CFGMODE)

3
make/defs.mk
View file

@ -307,6 +307,8 @@ LOCAL_MKFILES ?= $(wildcard GNUmakefile makefile Makefile *.mk)
LOG_QUAL_PREFIX ?= $(LOGID): LOG_QUAL_PREFIX ?= $(LOGID):
# -- standard dirs and files for build and install # -- standard dirs and files for build and install
INSTALLATION_FILE_TYPES += PREFIX
# -- CFG # -- CFG
INSTALLATION_FILE_TYPES += CFG INSTALLATION_FILE_TYPES += CFG
CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
@ -314,6 +316,7 @@ BUILD_CFGDIR = $(TOPDIR)/conf
ifeq ($(CONFIG_SUBDIR),) ifeq ($(CONFIG_SUBDIR),)
INSTALL_CFGDIR ?= $(CONFIG_DIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)
else else
INSTALL_CFGTOPDIR ?= $(CONFIG_DIR)
INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
endif endif
LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini *.yaml *.toml))) $(LOCAL_EXTRA_CFG) LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini *.yaml *.toml))) $(LOCAL_EXTRA_CFG)

2
make/include.mk
View file

@ -8,7 +8,7 @@ SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)
# mandatory targets # mandatory targets
all: $(PROJ_H) all: $(PROJ_H)
clean: clean.include clean: clean.include
install: install_HDR install: install_dir_PREFIX install_HDR
# not wäry naaice # not wäry naaice
ifneq ($(HDRDIR_SCOPE_SUFFIX),) ifneq ($(HDRDIR_SCOPE_SUFFIX),)

2
make/make.mk
View file

@ -31,7 +31,7 @@ endif
ifeq ($(CREATE_PKG_CONFIG),true) ifeq ($(CREATE_PKG_CONFIG),true)
all: build_PKG_CONFIG all: build_PKG_CONFIG
endif endif
install: $(DEVEL_TARGETS) install: install_dir_PREFIX $(DEVEL_TARGETS)
clean: textclean localclean doneclean clean.pkg-config clean: textclean localclean doneclean clean.pkg-config
test: all test: all

2
make/scripts-targets.mk
View file

@ -1,5 +1,5 @@
all: build_EXE build_CGI all: build_EXE build_CGI
install: install_files_INIT install_EXE install_files_CGI install_files_SYSCFG install: install_dir_PREFIX install_files_INIT install_EXE install_files_CGI install_files_SYSCFG
clean:allclean localclean doneclean textclean clean.init clean:allclean localclean doneclean textclean clean.init
test: all test: all

2
make/so.mk
View file

@ -18,7 +18,7 @@ include $(JWBDIR)/make/rules.mk
all: $(SHOBJS) $(BUILD_SHOBJS) all: $(SHOBJS) $(BUILD_SHOBJS)
clean: objclean textclean localclean profclean clean: objclean textclean localclean profclean
install: $(ALL) install_dir_LIB installso install: $(ALL) install_dir_PREFIX install_dir_LIB installso
$(BUILD_LIBDIR)/%.so: %.so $(BUILD_LIBDIR)/%.so: %.so
install -m 755 $< $@ install -m 755 $< $@

2
make/yapp.mk
View file

@ -13,7 +13,7 @@ endif
include $(JWBDIR)/make/exe.mk include $(JWBDIR)/make/exe.mk
all: build_EXE all: build_EXE
install: install_EXE install: install_dir_PREFIX install_EXE
clean: clean.yapp clean: clean.yapp
distclean: distclean: