diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 1e7f1ec1..bff7fdcf 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -10,7 +10,7 @@ VAR_PREFIX ?= $(PREFIX)/var DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) EXE_PREFIX ?= $(PREFIX) INIT_PREFIX ?= $(EXE_PREFIX) -SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig +SYSCFG_PREFIX ?= $(PREFIX)/sysconfig CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d IMG_PREFIX ?= $(PREFIX) diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 4e0374a2..698307c6 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -10,7 +10,7 @@ VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)opt DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT) EXE_PREFIX ?= $(PREFIX) 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) LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d IMG_PREFIX ?= $(PREFIX) diff --git a/make/defs.mk b/make/defs.mk index 5c46516c..e4ef8d74 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -100,13 +100,13 @@ CPPFLAGS += -DCATCH_ONLY_YERROR endif ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) -SYSCONFIG_PREFIX ?= /etc -SYSCONFIG_FILE ?= /etc/rc.config +SYSCFG_PREFIX ?= /etc +SYSCFG_FILE ?= /etc/rc.config else -SYSCONFIG_PREFIX ?= /etc/sysconfig -SYSCONFIG_FILE ?= $(SYSCONFIG_DIR)/$(PROJECT) +SYSCFG_PREFIX ?= /etc/sysconfig +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) endif -SYSCONFIG_DIR ?= $(SYSCONFIG_PREFIX) +SYSCFG_DIR ?= $(SYSCFG_PREFIX) OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid CFLAGS += -DVERSION=$(HEX_VERSION) @@ -197,7 +197,7 @@ IMAGES += $(wildcard *.png *.jpg *.bmp) # -- CFG CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf -SYSCONFIG_FILE ?= $(SYSCONFIG_DIR)/$(PROJECT) +SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) BUILD_CFGDIR = $(TOPDIR)/conf INSTALL_CFGDIR = $(CONFIG_DIR) INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) @@ -205,7 +205,7 @@ INSTALLED_CFG ?= $(addprefix $(INSTALL_CFGDIR)/,$(wildcard *.conf)) # -- SYSCFG SYSCFG_FILES += $(basename $(wildcard *.sysconf)) BUILD_SYSCFG = $(TOPDIR)/conf -INSTALL_SYSCFGDIR = $(SYSCONFIG_PREFIX) +INSTALL_SYSCFGDIR = $(SYSCFG_PREFIX) INSTALLED_SYSCFG ?= $(addprefix $(INSTALL_SYSCFGDIR)/,$(SYSCFG_FILES)) # -- HDR diff --git a/make/rules.mk b/make/rules.mk index 723c2519..b45c93a4 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -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 $(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ -#$(SYSCONFIG_DIR)/%: % +#$(SYSCFG_DIR)/%: % # $(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@