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: Consistently renamed "SYSCONFIG" to "SYSCFG"

Browse source
This commit is contained in:
Jan Lindemann 2008-05-22 09:24:28 +00:00 • committed by Jan Lindemann
commit 5eeec55ff9
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dev.mk
View file

@ -10,7 +10,7 @@ VAR_PREFIX ?= $(PREFIX)/var
DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX) INIT_PREFIX ?= $(EXE_PREFIX)
SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig SYSCFG_PREFIX ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)

2
make/defs-dist.mk
View file

@ -10,7 +10,7 @@ VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)opt
DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT) DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig SYSCFG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)

14
make/defs.mk
View file

@ -100,13 +100,13 @@ CPPFLAGS += -DCATCH_ONLY_YERROR
endif endif
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9)
SYSCONFIG_PREFIX ?= /etc SYSCFG_PREFIX ?= /etc
SYSCONFIG_FILE ?= /etc/rc.config SYSCFG_FILE ?= /etc/rc.config
else else
SYSCONFIG_PREFIX ?= /etc/sysconfig SYSCFG_PREFIX ?= /etc/sysconfig
SYSCONFIG_FILE ?= $(SYSCONFIG_DIR)/$(PROJECT) SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
endif endif
SYSCONFIG_DIR ?= $(SYSCONFIG_PREFIX) SYSCFG_DIR ?= $(SYSCFG_PREFIX)
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
CFLAGS += -DVERSION=$(HEX_VERSION) CFLAGS += -DVERSION=$(HEX_VERSION)
@ -197,7 +197,7 @@ IMAGES += $(wildcard *.png *.jpg *.bmp)
# -- CFG # -- CFG
CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
SYSCONFIG_FILE ?= $(SYSCONFIG_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))
@ -205,7 +205,7 @@ 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 = $(SYSCONFIG_PREFIX) INSTALL_SYSCFGDIR = $(SYSCFG_PREFIX)
INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES))
# -- HDR # -- HDR

2
make/rules.mk
View file

@ -317,6 +317,6 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh
$(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ $(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
#$(SYSCONFIG_DIR)/%: % #$(SYSCFG_DIR)/%: %
# $(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@ # $(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@