janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 07:00:39 +01:00
Code Activity

make: Add definition for LOG install targets

Browse source
This commit is contained in:
Jan Lindemann 2007-09-09 18:51:29 +00:00 • committed by Jan Lindemann
commit 76fe85cd38
4 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -13,6 +13,7 @@ INIT_PREFIX ?= $(EXE_PREFIX)
SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@ -120,6 +121,12 @@ IMGMODE ?= 666
IMGDIROWNER ?= $(shell id -un) IMGDIROWNER ?= $(shell id -un)
IMGDIRGROUP ?= $(shell id -gn) IMGDIRGROUP ?= $(shell id -gn)
IMGDIRMODE ?= 770 IMGDIRMODE ?= 770
LOGOWNER ?= $(DOCOWNER)
LOGGROUP ?= $(DOCGROUP)
LOGMODE ?= $(DOCMODE)
LOGDIROWNER ?= $(DOCDIROWNER)
LOGDIRGROUP ?= $(DOCDIROWNER)
LOGDIRMODE ?= $(DOCDIRMODE)
# -- options # -- options

7
make/defs-dist.mk
View file

@ -13,6 +13,7 @@ INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig SYSCONFIG_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)
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log
IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
@ -121,6 +122,12 @@ IMGMODE ?= $(DOCMODE)
IMGDIROWNER ?= $(DOCDIROWNER) IMGDIROWNER ?= $(DOCDIROWNER)
IMGDIRGROUP ?= $(DOCDIROWNER) IMGDIRGROUP ?= $(DOCDIROWNER)
IMGDIRMODE ?= $(DOCDIRMODE) IMGDIRMODE ?= $(DOCDIRMODE)
LOGOWNER ?= $(DOCOWNER)
LOGGROUP ?= $(DOCGROUP)
LOGMODE ?= $(DOCMODE)
LOGDIROWNER ?= $(DOCDIROWNER)
LOGDIRGROUP ?= $(DOCDIROWNER)
LOGDIRMODE ?= $(DOCDIRMODE)
# -- options # -- options

7
make/defs.mk
View file

@ -286,12 +286,17 @@ INSTALL_MAKEDIR ?= $(PREFIX)/make
INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES))
# -- IMG # -- IMG
BUILD_LIBDIR ?= .
BUILD_IMG ?= BUILD_IMG ?=
BUILD_IMGDIR ?= $(TOPDIR)/images BUILD_IMGDIR ?= $(TOPDIR)/images
INSTALL_IMGDIR ?= $(IMG_PREFIX)/images INSTALL_IMGDIR ?= $(IMG_PREFIX)/images
INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES)) INSTALLED_IMG ?= $(addprefix $(INSTALL_IMGDIR)/,$(IMAGES))
# -- LOG
BUILD_LOGDIR ?= $(TOPDIR)/log
BUILD_LOG ?=
INSTALL_LOGDIR ?= $(LOG_PREFIX)/$(PROJECT)
INSTALLED_LOG ?=
# -- PROFILE # -- PROFILE
# TODO: path_ file is omnipresent # TODO: path_ file is omnipresent
BUILD_PROFILEDIR = $(TOPDIR)/profile.d BUILD_PROFILEDIR = $(TOPDIR)/profile.d

2
make/rules.mk
View file

@ -245,7 +245,7 @@ check_not_empty_$(1):
fi fi
endef 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),\ #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
# $(eval $(call std_install_rules,$(type)$(attr))))) # $(eval $(call std_install_rules,$(type)$(attr)))))