diff --git a/make/conf.mk b/make/conf.mk index d010334b..f7297f50 100644 --- a/make/conf.mk +++ b/make/conf.mk @@ -3,8 +3,21 @@ include $(MODDIR)/make/rules.mk all: clean: clean.conf -install: install_CFG install_SYSCFG install_LOGROT +install: install_CFG install_SYSCFG install_LOGROT $(CONF_D) clean.conf: rm -rf *.h *~ .*.swp *.done +ifneq ($(CONFIG_SUBDIR),) +$(INSTALLED_CFG): $(INSTALL_CFGDIR) + +$(INSTALL_CFGDIR): + install -d -m $(CFGDIRMODE) -d $(CFGDIROWNER) -g $(CFGDIRGROUP) $@ +endif + +ifneq ($(CONF_D),) +INSTALLED_CONF_D = $(addprefix $(INSTALL_CFGDIR)/,$(CONF_D)) +$(INSTALL_CFGDIR)/$(CONF_D): + install -d -m $(CFGDIRMODE) -d $(CFGDIROWNER) -g $(CFGDIRGROUP) $@ +install: $(INSTALLED_CONF_D) +endif diff --git a/make/defs.mk b/make/defs.mk index f3ee84f0..dbe126ac 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -200,9 +200,13 @@ IMAGES += $(wildcard *.png *.jpg *.bmp) # -- CFG CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf -SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) BUILD_CFGDIR = $(TOPDIR)/conf +ifeq ($(CONFIG_SUBDIR),) INSTALL_CFGDIR ?= $(CONFIG_DIR) +else +INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) +endif INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) # -- SYSCFG