janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

defs.mk / rules.mk: Add support for PACKAGE_INSTALL_DIR

Browse source 
PACKAGE_INSTALL_DIR, true by default, can be used to turn off
target dir creation from a directory to avoid duplication from
other packages

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2024-12-06 14:35:59 +00:00
commit c575537456
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs.mk
View file

@ -227,6 +227,7 @@ ifneq ($(PROJECT_DESCR_FILE),)
endif endif
endif endif
CREATE_DEVEL ?= true CREATE_DEVEL ?= true
PACKAGE_INSTALL_DIR ?= true
ifeq ($(VERSION),) ifeq ($(VERSION),)
ifneq ($(wildcard $(VERSION_FILE)),) ifneq ($(wildcard $(VERSION_FILE)),)

4
make/rules.mk
View file

@ -395,7 +395,11 @@ $$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done
fi fi
$$(INSTALL_$(1)DIR): $$(INSTALL_$(1)DIR):
ifeq ($(PACKAGE_INSTALL_DIR),true)
$$(INSTALL) -D -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) $$(INSTALL) -D -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR)
else
mkdir -p $$(INSTALL_$(1)DIR)
endif
$$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR) $$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR)
$$(INSTALL) -D -p -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@ $$(INSTALL) -D -p -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@