From bcebe4dbd35ebf4e7536bcdb8dbcb2b379de87f9 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 30 Jan 2019 16:23:15 +0000 Subject: [PATCH] defs.mk: Fix commit 6fc4125 Commit 6fc4125 introduced broken installation paths if PROJECT was auto-detected. It included the version. Also include *.ini into LOCAL_CFG by default. Signed-off-by: Jan Lindemann --- make/defs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 1c1af4a3..863fe95a 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -50,7 +50,7 @@ endif CVSTOPDIR ?= $(PROJECTS_DIR)/.. ifeq ($(PROJECT),) - PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) + PROJECT := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//') endif GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh @@ -390,7 +390,7 @@ INSTALL_CFGDIR ?= $(CONFIG_DIR) else INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR) endif -LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl))) $(LOCAL_EXTRA_CFG) +LOCAL_CFG ?= $(filter-out %.site.conf, $(filter-out rsyslog-%, $(wildcard *.conf *.xml *.bprof *.jw-tmpl *.ini))) $(LOCAL_EXTRA_CFG) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG)) # -- SYSCFG