From fd158fcb68616aa9d930f7df0806fecfe601ae87 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 22 May 2008 09:59:54 +0000 Subject: [PATCH] defs.mk: SYSCFG_PREFIX, INSTALL_CFGDIR, EXE_SH - Kick out SYSCFG_PREFIX (SYSCFG_DIR is enough) - Make INSTALL_CFGDIR ?= CONFIG_DIR (instead of = CONFIG_DIR) maybe CONFIG_DIR can be left out, too - Add .py to EXE_SH --- make/defs.mk | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index e4ef8d74..8d08d3fc 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -100,13 +100,12 @@ CPPFLAGS += -DCATCH_ONLY_YERROR endif ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) -SYSCFG_PREFIX ?= /etc -SYSCFG_FILE ?= /etc/rc.config +SYSCFG_DIR ?= /etc +SYSCFG_FILE ?= /etc/rc.config else -SYSCFG_PREFIX ?= /etc/sysconfig -SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) +SYSCFG_DIR ?= /etc/sysconfig +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) endif -SYSCFG_DIR ?= $(SYSCFG_PREFIX) OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid CFLAGS += -DVERSION=$(HEX_VERSION) @@ -199,13 +198,13 @@ IMAGES += $(wildcard *.png *.jpg *.bmp) CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) BUILD_CFGDIR = $(TOPDIR)/conf -INSTALL_CFGDIR = $(CONFIG_DIR) +INSTALL_CFGDIR ?= $(CONFIG_DIR) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) # -- SYSCFG SYSCFG_FILES += $(basename $(wildcard *.sysconf)) BUILD_SYSCFG = $(TOPDIR)/conf -INSTALL_SYSCFGDIR = $(SYSCFG_PREFIX) +INSTALL_SYSCFGDIR = $(SYSCFG_DIR) INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) # -- HDR @@ -286,7 +285,7 @@ BUILD_EXE += $(BUILD_EXE_BIN) INSTALLED_EXE += $(INSTALL_EXEDIR)/$(EXE) $(INSTALLED_EXE_BIN) # -- SCRIPT -EXE_SH += $(wildcard *.sh *.pl *.pm *.bat) +EXE_SH += $(wildcard *.sh *.pl *.pm *.py *.bat) EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl)) BUILD_SCRIPTDIR = $(TOPDIR)/bin