janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs-[dist|dev].mk: Add new variables

Browse source 
- ENV_PREFIX now should have a trailing "/" or be empty
  - Add SYSCFG OWNER, GROUP, MODE, DIROWNER, DIRGROUP, DIRMODE
This commit is contained in:
Jan Lindemann 2008-05-06 16:04:03 +00:00 • committed by Jan Lindemann
commit 90c02b1be3
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/defs-dev.mk
View file

@ -5,25 +5,25 @@
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #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 VAR_PREFIX ?= $(PREFIX)/var
DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX) 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)
LD_CONF_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/ld.so.conf.d LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
IMG_PREFIX ?= $(PREFIX) IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX) JAVA_PREFIX ?= $(PREFIX)
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME) DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME)
PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX) PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
PIDDIR ?= $(VAR_PREFIX)/$(FLAVOUR_PATH_PREFIX)run PIDDIR ?= $(VAR_PREFIX)$(FLAVOUR_PATH_PREFIX)run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) 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 WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java JAVADIR ?= $(JAVA_PREFIX)/share/java
@ -46,6 +46,12 @@ CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE)
SYSCFGDIROWNER ?= $(CFGDIROWNER)
SYSCFGDIRGROUP ?= $(CFGDIRGROUP)
SYSCFGDIRMODE ?= $(CFGDIRMODE)
HDROWNER ?= $(shell id -un) HDROWNER ?= $(shell id -un)
HDRGROUP ?= $(shell id -gn) HDRGROUP ?= $(shell id -gn)
HDRMODE ?= 644 HDRMODE ?= 644

6
make/defs-dist.mk
View file

@ -46,6 +46,12 @@ CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
CFGDIRMODE ?= $(EXEDIRMODE) CFGDIRMODE ?= $(EXEDIRMODE)
SYSCFGOWNER ?= $(CFGOWNER)
SYSCFGGROUP ?= $(CFGGROUP)
SYSCFGMODE ?= $(CFGMODE)
SYSCFGDIROWNER ?= $(CFGDIROWNER)
SYSCFGDIRGROUP ?= $(CFGDIRGROUP)
SYSCFGDIRMODE ?= $(CFGDIRMODE)
HDROWNER ?= root HDROWNER ?= root
HDRGROUP ?= root HDRGROUP ?= root
HDRMODE ?= 644 HDRMODE ?= 644