diff --git a/make/defs-dev.mk b/make/defs-dev.mk index 2f256474..17a4dbf9 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -14,6 +14,7 @@ SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT) IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(PREFIX)/log +JAVA_PREFIX ?= $(PREFIX) IMAGEDIR ?= $(MODDIR)/../../images CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX) @@ -23,6 +24,7 @@ PIDDIR ?= $(VAR_PREFIX)/$(FLAVOUR_PATH_PREFIX)run DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(ENV_PREFIX)/$(HOME) WORKING_DIR ?= $(VAR_PREFIX)/lock +JAVADIR ?= $(JAVA_PREFIX)/share/java # -- misc LOGID ?= $(shell id -un)-$(PROJECT) @@ -127,6 +129,12 @@ LOGMODE ?= $(DOCMODE) LOGDIROWNER ?= $(DOCDIROWNER) LOGDIRGROUP ?= $(DOCDIROWNER) LOGDIRMODE ?= $(DOCDIRMODE) +JAVAOWNER ?= $(LIBOWNER) +JAVAGROUP ?= $(LIBGROUP) +JAVAMODE ?= $(LIBMODE) +JAVADIROWNER ?= $(LIBDIROWNER) +JAVADIRGROUP ?= $(LIBDIRGROUP) +JAVADIRMODE ?= $(LIBDIRMODE) # -- options diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 0e95062d..5bd1d613 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -14,6 +14,7 @@ SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT) IMG_PREFIX ?= $(PREFIX) LOG_PREFIX ?= $(ENV_PREFIX)/var/log +JAVA_PREFIX ?= $(PREFIX) IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d @@ -23,6 +24,7 @@ PIDDIR ?= $(VAR_PREFIX)/run DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) WORKING_DIR ?= $(VAR_PREFIX)/coredumps WORKING_DIR ?= $(VAR_PREFIX)/lock +JAVADIR ?= $(JAVA_PREFIX)/share/java # -- misc LOGID ?= $(PROJECT) @@ -128,6 +130,12 @@ LOGMODE ?= $(DOCMODE) LOGDIROWNER ?= $(DOCDIROWNER) LOGDIRGROUP ?= $(DOCDIROWNER) LOGDIRMODE ?= $(DOCDIRMODE) +JAVAOWNER ?= $(LIBOWNER) +JAVAGROUP ?= $(LIBGROUP) +JAVAMODE ?= $(LIBMODE) +JAVADIROWNER ?= $(LIBDIROWNER) +JAVADIRGROUP ?= $(LIBDIRGROUP) +JAVADIRMODE ?= $(LIBDIRMODE) # -- options