From f819f4975c78db971b46b26c042fa2fb12cdef47 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 18 Aug 2007 20:32:28 +0000
Subject: [PATCH] defs-dev.mk: Re-order to match defs-dist.mk

Add some more directories and default file attributes, should now be
line-to-line with defs-dist.mk
---
 make/defs-dev.mk | 51 +++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index e0413c68..69cdc797 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -6,8 +6,11 @@
 # -- 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)
+VAR_PREFIX       ?= $(PREFIX)/var
+DOC_PREFIX       ?= $(PREFIX)/doc/$(PROJECT)
+EXE_PREFIX       ?= $(PREFIX)
+SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
+CONFIG_DIR       ?= $(ENV_PREFIX)/$(HOME)/etc
 
 IMAGEDIR         ?= $(MODDIR)/../../images
 CTRLDIR          ?= $(ENV_PREFIX)/$(HOME)/bin
@@ -15,9 +18,8 @@ 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
+WORKING_DIR      ?= $(ENV_PREFIX)/$(HOME)
+WORKING_DIR      ?= $(VAR_PREFIX)/lock
 
 # -- misc
 LOGNAME          ?= $(shell whoami)-$(PROJECT)
@@ -31,33 +33,38 @@ 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
+CTRLGROUP        ?= $(EXEGROUP)
+CTRLOWNER        ?= $(EXEOWNER)
+CTRLMODE         ?= $(EXEMODE)
+INITGROUP        ?= $(EXEGROUP)
+INITOWNER        ?= $(EXEOWNER)
+INITMODE         ?= $(EXEMODE)
+LIBGROUP         ?= $(EXEGROUP)
+LIBOWNER         ?= $(EXEOWNER)
+LIBMODE          ?= $(EXEMODE)
+MAKEOWNER        ?= $(HDROWNER)
+MAKEGROUP        ?= $(HDRGROUP)
+MAKEMODE         ?= $(HDRMODE)
+PROFILEGROUP     ?= $(EXEGROUP)
+PROFILEOWNER     ?= $(EXEOWNER)
+PROFILEMODE      ?= $(EXEMODE)
 PROFILEDIRGROUP  ?= $(shell id -gn)
 PROFILEDIROWNER  ?= $(shell whoami)
-PROFILEDIRMODE   ?= 755
+PROFILEDIRMODE   ?= 770
 ROOTOWNER        ?= $(shell id -un)
 ROOTGROUP        ?= $(shell id -gn)
 DOCMODE          ?= $(HDRMODE)
 DOCOWNER         ?= $(HDROWNER)
 DOCGROUP         ?= $(HDROWNER)
-
+VARDIRGROUP      ?= $(shell whoami)
+VARDIROWNER      ?= $(shell id -gn)
+VARDIRMODE       ?= 770
+PREFIXDIRGROUP   ?= $(EXEGROUP)
+PREFIXDIROWNER   ?= $(EXEOWNER)
+PREFIXDIRMODE    ?= 770
 
 # -- options