diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 87150523..94151896 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -8,6 +8,7 @@ PREFIX ?= $(ENV_PREFIX)/$(HOME)/dat/test/$(PROJECT)-$(VERSION) VAR_PREFIX ?= $(ENV_PREFIX)/$(PREFIX)/var DOC_PREFIX ?= $(ENV_PREFIX)/$(PREFIX)/doc/$(PROJECT) + IMAGEDIR ?= $(ENV_PREFIX)/$(MODDIR)/../images CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME) @@ -53,6 +54,9 @@ PROFILEDIROWNER ?= $(shell whoami) PROFILEDIRMODE ?= 755 ROOTOWNER ?= $(shell id -un) ROOTGROUP ?= $(shell id -gn) +DOCMODE ?= $(HDRMODE) +DOCOWNER ?= $(HDROWNER) +DOCGROUP ?= $(HDROWNER) # -- options diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 0891d2f2..c5d8af94 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -17,6 +17,7 @@ PIDDIR ?= $(VAR_PREFIX)/run DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) CONFIG_DIR ?= $(PREFIX)/etc + CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf # -- misc @@ -56,6 +57,9 @@ DAEMON_RUN_USER ?= root DAEMON_RUN_GROUP ?= root ROOTOWNER ?= root ROOTGROUP ?= root +DOCMODE ?= $(HDRMODE) +DOCOWNER ?= $(HDROWNER) +DOCGROUP ?= $(HDRGROUP) # -- options