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-[dev|dist].mk: Reshuffle lots of variables

Browse source 
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 2007-08-16 22:11:10 +00:00 • committed by Jan Lindemann
commit 2ed77378fa
2 changed files with 106 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

101
make/defs-dev.mk
View file

@ -3,54 +3,56 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
#CONTRIBDIR = $(TOPDIR)/contrib # -- files
PREFIX = $(ENV_PREFIX)/$(HOME)/dat/test/$(PROJECT)-$(VERSION) #CONTRIBDIR ?= $(TOPDIR)/contrib
VAR_PREFIX = $(ENV_PREFIX)/$(PREFIX)/var PREFIX ?= $(ENV_PREFIX)/$(HOME)/dat/test/$(PROJECT)-$(VERSION)
DOC_PREFIX = $(ENV_PREFIX)/$(PREFIX)/doc/$(PROJECT) VAR_PREFIX ?= $(ENV_PREFIX)/$(PREFIX)/var
EXEGROUP = $(shell id -gn) DOC_PREFIX ?= $(ENV_PREFIX)/$(PREFIX)/doc/$(PROJECT)
EXEOWNER = $(shell whoami) IMAGEDIR ?= $(ENV_PREFIX)/$(MODDIR)/../images
EXEMODE = 770 CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin
CFGGROUP = $(shell id -gn) DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME)
CFGOWNER = $(shell whoami) PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d
CFGMODE = 660 PIDDIR ?= $(VAR_PREFIX)/run
CTRLGROUP = $(shell id -gn) DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
CTRLOWNER = $(shell whoami) CONFIG_DIR ?= $(PREFIX)/etc
CTRLMODE = 770
INITGROUP = $(shell id -gn) CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
INITOWNER = $(shell whoami)
INITMODE = 770 # -- misc
LIBGROUP = $(shell id -gn) LOGNAME ?= $(shell whoami)-$(PROJECT)
LIBOWNER = $(shell whoami) DAEMON_RUN_USER ?= $(shell whoami)
LIBMODE = 770 DAEMON_RUN_GROUP ?= $(shell id -gn)
HDRGROUP = $(shell id -gn)
HDROWNER = $(shell whoami) # -- file attributes
HDRMODE = 644 EXEGROUP ?= $(shell id -gn)
MAKEOWNER = $(shell whoami) EXEOWNER ?= $(shell whoami)
MAKEGROUP = $(shell id -ng) EXEMODE ?= 770
MAKEMODE = 644 CFGGROUP ?= $(shell id -gn)
PROFILEGROUP = $(shell id -gn) CFGOWNER ?= $(shell whoami)
PROFILEOWNER = $(shell whoami) CFGMODE ?= 660
PROFILEMODE = 755 CTRLGROUP ?= $(shell id -gn)
PROFILEDIR = $(HOME)/.profile.d CTRLOWNER ?= $(shell whoami)
PROFILEDIRGROUP = $(shell id -gn) CTRLMODE ?= 770
PROFILEDIROWNER = $(shell whoami) INITGROUP ?= $(shell id -gn)
PROFILEDIRMODE = 755 INITOWNER ?= $(shell whoami)
INITDIR = $(HOME)/bin INITMODE ?= 770
PIDDIR = $(VAR_PREFIX)/run LIBGROUP ?= $(shell id -gn)
DAEMON_RUN_DIR = $(HOME) LIBOWNER ?= $(shell whoami)
DAEMON_RUN_USER = $(shell whoami) LIBMODE ?= 770
DAEMON_RUN_GROUP = $(shell id -gn) HDRGROUP ?= $(shell id -gn)
LOGNAME = $(shell whoami)-$(PROJECT) HDROWNER ?= $(shell whoami)
DOWNLOADDIRS = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) HDRMODE ?= 644
CONFIG_DIR = $(PREFIX)/etc MAKEOWNER ?= $(shell whoami)
CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg MAKEGROUP ?= $(shell id -ng)
LIBTYPE = shared MAKEMODE ?= 644
FTP_PUB_DIR_ABS = $(JANNET_PROJ_DIR)/$(PROJECT) PROFILEGROUP ?= $(shell id -gn)
PROFILE_DIR = $(HOME)/.profile.d PROFILEOWNER ?= $(shell whoami)
ROOTOWNER = $(shell id -un) PROFILEMODE ?= 755
ROOTGROUP = $(shell id -gn) PROFILEDIRGROUP ?= $(shell id -gn)
IMAGEDIR = $(MODDIR)/../images PROFILEDIROWNER ?= $(shell whoami)
CTRLDIR = $(HOME)/bin PROFILEDIRMODE ?= 755
ROOTOWNER ?= $(shell id -un)
ROOTGROUP ?= $(shell id -gn)
# -- options # -- options
@ -84,9 +86,10 @@ LOG_THREAD_NAMES = true
#STRIP_SYMBOLS = true #STRIP_SYMBOLS = true
COMPILE_DEBUG_CODE = true COMPILE_DEBUG_CODE = true
USE_COMPILER_DEBUG_OPTS = true USE_COMPILER_DEBUG_OPTS = true
USE_COMPILER_OPTIMIZATION_OPTS = true #USE_COMPILER_OPTIMIZATION_OPTS = true
#USE_FUSE = true #USE_FUSE = true
#USE_SNDFILE = true #USE_SNDFILE = true
#USE_GLIB = true

102
make/defs-dist.mk
View file

@ -3,54 +3,59 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
#CONTRIBDIR = $(TOPDIR)/contrib # -- files
PREFIX = $(ENV_PREFIX)/opt/$(PROJECT) #CONTRIBDIR ?= $(TOPDIR)/contrib
VAR_PREFIX = $(ENV_PREFIX)/var/opt PREFIX ?= $(ENV_PREFIX)/opt/$(PROJECT)
DOC_PREFIX = $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT) VAR_PREFIX ?= $(ENV_PREFIX)/var/opt
EXEGROUP = root DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT)
EXEOWNER = root
EXEMODE = 755 # dunno if this is cool, see defs-dist.mk
CFGGROUP = root IMAGEDIR ?= $(PREFIX)/images
CFGOWNER = root CTRLDIR ?= $(ENV_PREFIX)/etc/init.d
CFGMODE = 640 PROFILE_DIR ?= $(ENV_PREFIX)/etc/profile.d
CTRLGROUP = root PIDDIR ?= $(VAR_PREFIX)/run
CTRLOWNER = root DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles
CTRLMODE = 750 DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
INITGROUP = root CONFIG_DIR ?= $(PREFIX)/etc
INITOWNER = root CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
INITMODE = 740
LIBGROUP = root # -- misc
LIBOWNER = root LOGNAME ?= $(PROJECT)
LIBMODE = 755 DAEMON_RUN_USER ?= root
HDRGROUP = root DAEMON_RUN_GROUP ?= root
HDROWNER = root
HDRMODE = 644 # -- file attributes
MAKEOWNER = root EXEGROUP ?= root
MAKEGROUP = root EXEOWNER ?= root
MAKEMODE = 644 EXEMODE ?= 770
PROFILEGROUP = root CFGGROUP ?= root
PROFILEOWNER = root CFGOWNER ?= root
PROFILEMODE = 755 CFGMODE ?= 660
PROFILEDIRGROUP = root CTRLGROUP ?= root
PROFILEDIROWNER = root CTRLOWNER ?= root
PROFILEDIRMODE = 755 CTRLMODE ?= 770
PROFILEDIR = /etc/profile.d INITGROUP ?= root
INITDIR = /etc/init.d INITOWNER ?= root
PIDDIR = $(VAR_PREFIX)/run INITMODE ?= 770
DAEMON_RUN_DIR = /opt/$(PROJECT) LIBGROUP ?= root
DAEMON_RUN_USER = dsprun LIBOWNER ?= root
DAEMON_RUN_GROUP = dsprun LIBMODE ?= 770
LOGNAME = $(PROJECT) HDRGROUP ?= root
DOWNLOADDIRS = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) HDROWNER ?= root
CONFIG_DIR = $(PREFIX)/etc HDRMODE ?= 644
CONFIG_FILE = $(CONFIG_DIR)/$(PROJECT).cfg MAKEOWNER ?= root
LIBTYPE = shared MAKEGROUP ?= root
PROFILE_DIR = $(ENV_PREFIX)/etc/profile.d MAKEMODE ?= 644
ROOTOWNER = root PROFILEGROUP ?= root
ROOTGROUP = root PROFILEOWNER ?= root
# dunno if this is cool, see defs-dev.mk PROFILEMODE ?= 755
IMAGEDIR = $(TOPDIR)/images PROFILEDIRGROUP ?= root
CTRLDIR = /etc/rc.d PROFILEDIROWNER ?= root
PROFILEDIRMODE ?= 755
DAEMON_RUN_USER ?= root
DAEMON_RUN_GROUP ?= root
ROOTOWNER ?= root
ROOTGROUP ?= root
# -- options # -- options
@ -87,4 +92,5 @@ USE_COMPILER_OPTIMIZATION_OPTS = true
#USE_FUSE = true #USE_FUSE = true
#USE_SNDFILE = true #USE_SNDFILE = true
#USE_GLIB = true