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

make: Support CONFIG_SUBDIR and CONF_D

Browse source
This commit is contained in:
Jan Lindemann 2009-03-26 16:05:07 +00:00 • committed by Jan Lindemann
commit 05ed5dfd02
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/conf.mk
View file

@ -3,8 +3,21 @@ include $(MODDIR)/make/rules.mk
all: all:
clean: clean.conf clean: clean.conf
install: install_CFG install_SYSCFG install_LOGROT install: install_CFG install_SYSCFG install_LOGROT $(CONF_D)
clean.conf: clean.conf:
rm -rf *.h *~ .*.swp *.done 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

6
make/defs.mk
View file

@ -200,9 +200,13 @@ IMAGES += $(wildcard *.png *.jpg *.bmp)
# -- CFG # -- CFG
CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
BUILD_CFGDIR = $(TOPDIR)/conf BUILD_CFGDIR = $(TOPDIR)/conf
ifeq ($(CONFIG_SUBDIR),)
INSTALL_CFGDIR ?= $(CONFIG_DIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)
else
INSTALL_CFGDIR ?= $(CONFIG_DIR)/$(CONFIG_SUBDIR)
endif
INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf))
# -- SYSCFG # -- SYSCFG