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

Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

Browse source
This commit is contained in:
Jan Lindemann 2011-02-20 14:15:22 +00:00 • committed by Jan Lindemann
commit 2939f8e3a8
29 changed files with 743 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

11
make/defs-dev.mk
View file

@ -10,7 +10,7 @@ VAR_PREFIX ?= $(PREFIX)/var
DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT)
EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX)
CGI_DIR ?= $(PREFIX)/cgi-bin
HTDOCS_PREFIX ?= $(ENV_PREFIX)$(HOME)/srv/www/htdocs
SYSCFG_DIR ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
@ -19,6 +19,7 @@ RSYSLOG_DIR ?= $(ENV_PREFIX)$(HOME)/etc/rsyslog.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@ -30,6 +31,8 @@ DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443
WORKING_DIR ?= $(ENV_PREFIX)$(HOME)
WORKING_DIR ?= $(VAR_PREFIX)/lock
JAVADIR ?= $(JAVA_PREFIX)/share/java
PROJECT_HTMLDIR ?= $(HTDOCS_PREFIX)/proj/$(PROJECT)
CGI_DIR ?= $(HTDOCS_PREFIX)/cgi-bin
# -- misc
LOGID ?= $(shell id -un)-$(PROJECT)
@ -86,6 +89,12 @@ CGIMODE ?= $(EXEMODE)
CGIDIROWNER ?= $(EXEDIROWNER)
CGIDIRGROUP ?= $(EXEDIRGROUP)
CGIDIRMODE ?= $(EXEDIRMODE)
HTMLOWNER ?= $(shell id -un)
HTMLGROUP ?= $(shell id -gn)
HTMLMODE ?= 644
HTMLDIROWNER ?= $(shell id -un)
HTMLDIRGROUP ?= $(shell id -gn)
HTMLDIRMODE ?= 755
LIBOWNER ?= $(EXEOWNER)
LIBGROUP ?= $(EXEGROUP)
LIBMODE ?= $(EXEMODE)