mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
defs-[dev|dist].mk: Reshuffle lots of variables
Re-sort variables big time, remov some double variables (e.g. INITDIR vs. CTRLDIR vs. CTRL_DIR), let', let'ss see where it breaks
This commit is contained in:
Jan Lindemann
parent
a979d74a9d
commit
2ed77378fa
2 changed files with 106 additions and 97 deletions
101
make/defs-dev.mk
101
make/defs-dev.mk
|
|
@ -3,54 +3,56 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
#CONTRIBDIR = $(TOPDIR)/contrib
|
||||
PREFIX = $(ENV_PREFIX)/$(HOME)/dat/test/$(PROJECT)-$(VERSION)
|
||||
VAR_PREFIX = $(ENV_PREFIX)/$(PREFIX)/var
|
||||
DOC_PREFIX = $(ENV_PREFIX)/$(PREFIX)/doc/$(PROJECT)
|
||||
EXEGROUP = $(shell id -gn)
|
||||
EXEOWNER = $(shell whoami)
|
||||
EXEMODE = 770
|
||||
CFGGROUP = $(shell id -gn)
|
||||
CFGOWNER = $(shell whoami)
|
||||
CFGMODE = 660
|
||||
CTRLGROUP = $(shell id -gn)
|
||||
CTRLOWNER = $(shell whoami)
|
||||
CTRLMODE = 770
|
||||
INITGROUP = $(shell id -gn)
|
||||
INITOWNER = $(shell whoami)
|
||||
INITMODE = 770
|
||||
LIBGROUP = $(shell id -gn)
|
||||
LIBOWNER = $(shell whoami)
|
||||
LIBMODE = 770
|
||||
HDRGROUP = $(shell id -gn)
|
||||
HDROWNER = $(shell whoami)
|
||||
HDRMODE = 644
|
||||
MAKEOWNER = $(shell whoami)
|
||||
MAKEGROUP = $(shell id -ng)
|
||||
MAKEMODE = 644
|
||||
PROFILEGROUP = $(shell id -gn)
|
||||
PROFILEOWNER = $(shell whoami)
|
||||
PROFILEMODE = 755
|
||||
PROFILEDIR = $(HOME)/.profile.d
|
||||
PROFILEDIRGROUP = $(shell id -gn)
|
||||
PROFILEDIROWNER = $(shell whoami)
|
||||
PROFILEDIRMODE = 755
|
||||
INITDIR = $(HOME)/bin
|
||||
PIDDIR = $(VAR_PREFIX)/run
|
||||
DAEMON_RUN_DIR = $(HOME)
|
||||
DAEMON_RUN_USER = $(shell whoami)
|
||||
DAEMON_RUN_GROUP = $(shell id -gn)
|
||||
LOGNAME = $(shell whoami)-$(PROJECT)
|
||||
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).cfg
|
||||
LIBTYPE = shared
|
||||
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT)
|
||||
PROFILE_DIR = $(HOME)/.profile.d
|
||||
ROOTOWNER = $(shell id -un)
|
||||
ROOTGROUP = $(shell id -gn)
|
||||
IMAGEDIR = $(MODDIR)/../images
|
||||
CTRLDIR = $(HOME)/bin
|
||||
# -- files
|
||||
#CONTRIBDIR ?= $(TOPDIR)/contrib
|
||||
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)
|
||||
PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d
|
||||
PIDDIR ?= $(VAR_PREFIX)/run
|
||||
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
|
||||
LOGNAME ?= $(shell whoami)-$(PROJECT)
|
||||
DAEMON_RUN_USER ?= $(shell whoami)
|
||||
DAEMON_RUN_GROUP ?= $(shell id -gn)
|
||||
|
||||
# -- file attributes
|
||||
EXEGROUP ?= $(shell id -gn)
|
||||
EXEOWNER ?= $(shell whoami)
|
||||
EXEMODE ?= 770
|
||||
CFGGROUP ?= $(shell id -gn)
|
||||
CFGOWNER ?= $(shell whoami)
|
||||
CFGMODE ?= 660
|
||||
CTRLGROUP ?= $(shell id -gn)
|
||||
CTRLOWNER ?= $(shell whoami)
|
||||
CTRLMODE ?= 770
|
||||
INITGROUP ?= $(shell id -gn)
|
||||
INITOWNER ?= $(shell whoami)
|
||||
INITMODE ?= 770
|
||||
LIBGROUP ?= $(shell id -gn)
|
||||
LIBOWNER ?= $(shell whoami)
|
||||
LIBMODE ?= 770
|
||||
HDRGROUP ?= $(shell id -gn)
|
||||
HDROWNER ?= $(shell whoami)
|
||||
HDRMODE ?= 644
|
||||
MAKEOWNER ?= $(shell whoami)
|
||||
MAKEGROUP ?= $(shell id -ng)
|
||||
MAKEMODE ?= 644
|
||||
PROFILEGROUP ?= $(shell id -gn)
|
||||
PROFILEOWNER ?= $(shell whoami)
|
||||
PROFILEMODE ?= 755
|
||||
PROFILEDIRGROUP ?= $(shell id -gn)
|
||||
PROFILEDIROWNER ?= $(shell whoami)
|
||||
PROFILEDIRMODE ?= 755
|
||||
ROOTOWNER ?= $(shell id -un)
|
||||
ROOTGROUP ?= $(shell id -gn)
|
||||
|
||||
|
||||
# -- options
|
||||
|
|
@ -84,9 +86,10 @@ LOG_THREAD_NAMES = true
|
|||
#STRIP_SYMBOLS = true
|
||||
COMPILE_DEBUG_CODE = true
|
||||
USE_COMPILER_DEBUG_OPTS = true
|
||||
USE_COMPILER_OPTIMIZATION_OPTS = true
|
||||
#USE_COMPILER_OPTIMIZATION_OPTS = true
|
||||
|
||||
#USE_FUSE = true
|
||||
#USE_SNDFILE = true
|
||||
#USE_GLIB = true
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,54 +3,59 @@
|
|||
# contact@jannet.de
|
||||
# $Id$
|
||||
|
||||
#CONTRIBDIR = $(TOPDIR)/contrib
|
||||
PREFIX = $(ENV_PREFIX)/opt/$(PROJECT)
|
||||
VAR_PREFIX = $(ENV_PREFIX)/var/opt
|
||||
DOC_PREFIX = $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT)
|
||||
EXEGROUP = root
|
||||
EXEOWNER = root
|
||||
EXEMODE = 755
|
||||
CFGGROUP = root
|
||||
CFGOWNER = root
|
||||
CFGMODE = 640
|
||||
CTRLGROUP = root
|
||||
CTRLOWNER = root
|
||||
CTRLMODE = 750
|
||||
INITGROUP = root
|
||||
INITOWNER = root
|
||||
INITMODE = 740
|
||||
LIBGROUP = root
|
||||
LIBOWNER = root
|
||||
LIBMODE = 755
|
||||
HDRGROUP = root
|
||||
HDROWNER = root
|
||||
HDRMODE = 644
|
||||
MAKEOWNER = root
|
||||
MAKEGROUP = root
|
||||
MAKEMODE = 644
|
||||
PROFILEGROUP = root
|
||||
PROFILEOWNER = root
|
||||
PROFILEMODE = 755
|
||||
PROFILEDIRGROUP = root
|
||||
PROFILEDIROWNER = root
|
||||
PROFILEDIRMODE = 755
|
||||
PROFILEDIR = /etc/profile.d
|
||||
INITDIR = /etc/init.d
|
||||
PIDDIR = $(VAR_PREFIX)/run
|
||||
DAEMON_RUN_DIR = /opt/$(PROJECT)
|
||||
DAEMON_RUN_USER = dsprun
|
||||
DAEMON_RUN_GROUP = dsprun
|
||||
LOGNAME = $(PROJECT)
|
||||
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).cfg
|
||||
LIBTYPE = shared
|
||||
PROFILE_DIR = $(ENV_PREFIX)/etc/profile.d
|
||||
ROOTOWNER = root
|
||||
ROOTGROUP = root
|
||||
# dunno if this is cool, see defs-dev.mk
|
||||
IMAGEDIR = $(TOPDIR)/images
|
||||
CTRLDIR = /etc/rc.d
|
||||
# -- files
|
||||
#CONTRIBDIR ?= $(TOPDIR)/contrib
|
||||
PREFIX ?= $(ENV_PREFIX)/opt/$(PROJECT)
|
||||
VAR_PREFIX ?= $(ENV_PREFIX)/var/opt
|
||||
DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT)
|
||||
|
||||
# dunno if this is cool, see defs-dist.mk
|
||||
IMAGEDIR ?= $(PREFIX)/images
|
||||
CTRLDIR ?= $(ENV_PREFIX)/etc/init.d
|
||||
PROFILE_DIR ?= $(ENV_PREFIX)/etc/profile.d
|
||||
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
|
||||
LOGNAME ?= $(PROJECT)
|
||||
DAEMON_RUN_USER ?= root
|
||||
DAEMON_RUN_GROUP ?= root
|
||||
|
||||
# -- file attributes
|
||||
EXEGROUP ?= root
|
||||
EXEOWNER ?= root
|
||||
EXEMODE ?= 770
|
||||
CFGGROUP ?= root
|
||||
CFGOWNER ?= root
|
||||
CFGMODE ?= 660
|
||||
CTRLGROUP ?= root
|
||||
CTRLOWNER ?= root
|
||||
CTRLMODE ?= 770
|
||||
INITGROUP ?= root
|
||||
INITOWNER ?= root
|
||||
INITMODE ?= 770
|
||||
LIBGROUP ?= root
|
||||
LIBOWNER ?= root
|
||||
LIBMODE ?= 770
|
||||
HDRGROUP ?= root
|
||||
HDROWNER ?= root
|
||||
HDRMODE ?= 644
|
||||
MAKEOWNER ?= root
|
||||
MAKEGROUP ?= root
|
||||
MAKEMODE ?= 644
|
||||
PROFILEGROUP ?= root
|
||||
PROFILEOWNER ?= root
|
||||
PROFILEMODE ?= 755
|
||||
PROFILEDIRGROUP ?= root
|
||||
PROFILEDIROWNER ?= root
|
||||
PROFILEDIRMODE ?= 755
|
||||
DAEMON_RUN_USER ?= root
|
||||
DAEMON_RUN_GROUP ?= root
|
||||
ROOTOWNER ?= root
|
||||
ROOTGROUP ?= root
|
||||
|
||||
# -- options
|
||||
|
||||
|
|
@ -87,4 +92,5 @@ USE_COMPILER_OPTIMIZATION_OPTS = true
|
|||
|
||||
#USE_FUSE = true
|
||||
#USE_SNDFILE = true
|
||||
#USE_GLIB = true
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue