diff --git a/make/defs-dev.mk b/make/defs-dev.mk index b945f138..1e7f1ec1 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -5,25 +5,25 @@ # -- files #CONTRIBDIR ?= $(TOPDIR)/contrib -PREFIX ?= $(ENV_PREFIX)/$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT)-$(VERSION) +PREFIX ?= $(ENV_PREFIX)$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT)-$(VERSION) VAR_PREFIX ?= $(PREFIX)/var DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) EXE_PREFIX ?= $(PREFIX) INIT_PREFIX ?= $(EXE_PREFIX) SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig -CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) -LD_CONF_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/ld.so.conf.d +CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) +LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(PREFIX)/log JAVA_PREFIX ?= $(PREFIX) IMAGEDIR ?= $(MODDIR)/../../images -CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) -DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME) -PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) -PIDDIR ?= $(VAR_PREFIX)/$(FLAVOUR_PATH_PREFIX)run +CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) +DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME) +PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) +PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) -WORKING_DIR ?= $(ENV_PREFIX)/$(HOME) +WORKING_DIR ?= $(ENV_PREFIX)$(HOME) WORKING_DIR ?= $(VAR_PREFIX)/lock JAVADIR ?= $(JAVA_PREFIX)/share/java @@ -46,6 +46,12 @@ CFGMODE ?= 660 CFGDIROWNER ?= $(EXEDIROWNER) CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRMODE ?= $(EXEDIRMODE) +SYSCFGOWNER ?= $(CFGOWNER) +SYSCFGGROUP ?= $(CFGGROUP) +SYSCFGMODE ?= $(CFGMODE) +SYSCFGDIROWNER ?= $(CFGDIROWNER) +SYSCFGDIRGROUP ?= $(CFGDIRGROUP) +SYSCFGDIRMODE ?= $(CFGDIRMODE) HDROWNER ?= $(shell id -un) HDRGROUP ?= $(shell id -gn) HDRMODE ?= 644 diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 663fd3e2..4e0374a2 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -46,6 +46,12 @@ CFGMODE ?= 660 CFGDIROWNER ?= $(EXEDIROWNER) CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRMODE ?= $(EXEDIRMODE) +SYSCFGOWNER ?= $(CFGOWNER) +SYSCFGGROUP ?= $(CFGGROUP) +SYSCFGMODE ?= $(CFGMODE) +SYSCFGDIROWNER ?= $(CFGDIROWNER) +SYSCFGDIRGROUP ?= $(CFGDIRGROUP) +SYSCFGDIRMODE ?= $(CFGDIRMODE) HDROWNER ?= root HDRGROUP ?= root HDRMODE ?= 644