diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 46a9e0b9..f4ac6d64 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -13,6 +13,7 @@ INIT_PREFIX ?= $(EXE_PREFIX) SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) IMG_PREFIX ?= $(PREFIX) +LOG_PREFIX ?= $(PREFIX)/log IMAGEDIR ?= $(MODDIR)/../../images CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) @@ -120,6 +121,12 @@ IMGMODE ?= 666 IMGDIROWNER ?= $(shell id -un) IMGDIRGROUP ?= $(shell id -gn) IMGDIRMODE ?= 770 +LOGOWNER ?= $(DOCOWNER) +LOGGROUP ?= $(DOCGROUP) +LOGMODE ?= $(DOCMODE) +LOGDIROWNER ?= $(DOCDIROWNER) +LOGDIRGROUP ?= $(DOCDIROWNER) +LOGDIRMODE ?= $(DOCDIRMODE) # -- options diff --git a/make/defs-dist.mk b/make/defs-dist.mk index fe4dc2e6..5f503cb0 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -13,6 +13,7 @@ INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX) SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) IMG_PREFIX ?= $(PREFIX) +LOG_PREFIX ?= $(ENV_PREFIX)/var/log IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d @@ -121,6 +122,12 @@ IMGMODE ?= $(DOCMODE) IMGDIROWNER ?= $(DOCDIROWNER) IMGDIRGROUP ?= $(DOCDIROWNER) IMGDIRMODE ?= $(DOCDIRMODE) +LOGOWNER ?= $(DOCOWNER) +LOGGROUP ?= $(DOCGROUP) +LOGMODE ?= $(DOCMODE) +LOGDIROWNER ?= $(DOCDIROWNER) +LOGDIRGROUP ?= $(DOCDIROWNER) +LOGDIRMODE ?= $(DOCDIRMODE) # -- options diff --git a/make/defs.mk b/make/defs.mk index eb5d17d7..5da94c7a 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -286,12 +286,17 @@ INSTALL_MAKEDIR ?= $(PREFIX)/make INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) # -- IMG -BUILD_LIBDIR ?= . BUILD_IMG ?= BUILD_IMGDIR ?= $(TOPDIR)/images INSTALL_IMGDIR ?= $(IMG_PREFIX)/images INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) +# -- LOG +BUILD_LOGDIR ?= $(TOPDIR)/log +BUILD_LOG ?= +INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT) +INSTALLED_LOG ?= + # -- PROFILE # TODO: path_ file is omnipresent BUILD_PROFILEDIR = $(TOPDIR)/profile.d diff --git a/make/rules.mk b/make/rules.mk index 550f6dff..3eb61735 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -245,7 +245,7 @@ check_not_empty_$(1): fi endef -INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG +INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG LOG #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\ # $(eval $(call std_install_rules,$(type)$(attr)))))