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

defs.mk: Fix commit 6fc4125

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-30 16:23:15 +00:00
commit bcebe4dbd3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -50,7 +50,7 @@ endif
CVSTOPDIR ?= $(PROJECTS_DIR)/.. CVSTOPDIR ?= $(PROJECTS_DIR)/..
ifeq ($(PROJECT),) ifeq ($(PROJECT),)
PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) PROJECT := $(shell echo $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(realpath $(TOPDIR)))) | $(SED) 's/-[0-9].*//')
endif endif
GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/get-os.sh
@ -390,7 +390,7 @@ INSTALL_CFGDIR ?= $(CONFIG_DIR)
else else
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))) $(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)) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(LOCAL_CFG))
# -- SYSCFG # -- SYSCFG