janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-20 13:37:38 +01:00
Code Activity

defs.mk: SYSCFG_PREFIX, INSTALL_CFGDIR, EXE_SH

Browse source 
- 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
This commit is contained in:
Jan Lindemann 2008-05-22 09:59:54 +00:00 • committed by Jan Lindemann
commit fd158fcb68
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
make/defs.mk
View file

@ -100,13 +100,12 @@ CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9)
SYSCFG_PREFIX ?= /etc SYSCFG_DIR ?= /etc
SYSCFG_FILE ?= /etc/rc.config SYSCFG_FILE ?= /etc/rc.config
else else
SYSCFG_PREFIX ?= /etc/sysconfig SYSCFG_DIR ?= /etc/sysconfig
SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
endif endif
SYSCFG_DIR ?= $(SYSCFG_PREFIX)
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
CFLAGS += -DVERSION=$(HEX_VERSION) CFLAGS += -DVERSION=$(HEX_VERSION)
@ -199,13 +198,13 @@ IMAGES += $(wildcard *.png *.jpg *.bmp)
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
INSTALL_CFGDIR = $(CONFIG_DIR) INSTALL_CFGDIR ?= $(CONFIG_DIR)
INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf))
# -- SYSCFG # -- SYSCFG
SYSCFG_FILES += $(basename $(wildcard *.sysconf)) SYSCFG_FILES += $(basename $(wildcard *.sysconf))
BUILD_SYSCFG = $(TOPDIR)/conf BUILD_SYSCFG = $(TOPDIR)/conf
INSTALL_SYSCFGDIR = $(SYSCFG_PREFIX) INSTALL_SYSCFGDIR = $(SYSCFG_DIR)
INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
# -- HDR # -- HDR
@ -286,7 +285,7 @@ BUILD_EXE += $(BUILD_EXE_BIN)
INSTALLED_EXE += $(INSTALL_EXEDIR)/$(EXE) $(INSTALLED_EXE_BIN) INSTALLED_EXE += $(INSTALL_EXEDIR)/$(EXE) $(INSTALLED_EXE_BIN)
# -- SCRIPT # -- 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)) EXE_SH += $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
BUILD_SCRIPTDIR = $(TOPDIR)/bin BUILD_SCRIPTDIR = $(TOPDIR)/bin