From c57553745684a237955de8e8e7abcefcd3f0d314 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 6 Dec 2024 14:35:59 +0000 Subject: [PATCH] defs.mk / rules.mk: Add support for PACKAGE_INSTALL_DIR 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 --- make/defs.mk | 1 + make/rules.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index e3484c97..f377dbe9 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -227,6 +227,7 @@ ifneq ($(PROJECT_DESCR_FILE),) endif endif CREATE_DEVEL ?= true +PACKAGE_INSTALL_DIR ?= true ifeq ($(VERSION),) ifneq ($(wildcard $(VERSION_FILE)),) diff --git a/make/rules.mk b/make/rules.mk index 560395bb..ce0c0cd3 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -395,7 +395,11 @@ $$(BUILD_$(1)DIR)/%: % | $$(TOPDIR)/dir_build_$(1).done fi $$(INSTALL_$(1)DIR): +ifeq ($(PACKAGE_INSTALL_DIR),true) $$(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) -D -p -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@