From 946aaa27fba5c112e5dce9ad01476a78fd04d288 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Tue, 28 Aug 2007 23:55:32 +0000
Subject: [PATCH] defs*.mk: Add FLAVOUR_(PREFIX|PATH_PREFIX|PATH_SUFFIX)

---
 make/defs-dev.mk  | 10 +++++-----
 make/defs-dist.mk | 18 +++++++++---------
 make/defs.mk      | 23 +++++++++++++++--------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index be03db4d..effab860 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -5,19 +5,19 @@
 
 # -- files
 #CONTRIBDIR       ?= $(TOPDIR)/contrib
-PREFIX           ?= $(ENV_PREFIX)/$(HOME)/dat/test/$(PROJECT)-$(VERSION)
+PREFIX           ?= $(ENV_PREFIX)/$(HOME)/dat/test/$(FLAVOUR_PREFIX)$(PROJECT)-$(VERSION)
 VAR_PREFIX       ?= $(PREFIX)/var
 DOC_PREFIX       ?= $(PREFIX)/doc/$(PROJECT)
 EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(EXE_PREFIX)
 SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
-CONFIG_DIR       ?= $(ENV_PREFIX)/$(HOME)/etc
+CONFIG_DIR       ?= $(ENV_PREFIX)/$(HOME)/etc$(FLAVOUR_PATH_SUFFIX)
 
 IMAGEDIR         ?= $(MODDIR)/../../images
-CTRLDIR          ?= $(ENV_PREFIX)/$(HOME)/bin
+CTRLDIR          ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
 DAEMON_RUN_DIR   ?= $(ENV_PREFIX)/$(HOME)
-PROFILE_DIR      ?= $(ENV_PREFIX)/$(HOME)/.profile.d
-PIDDIR           ?= $(VAR_PREFIX)/run
+PROFILE_DIR      ?= $(ENV_PREFIX)/$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
+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
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index f159fcda..217e73fc 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -5,18 +5,18 @@
 
 # -- files
 #CONTRIBDIR       ?= $(TOPDIR)/contrib
-PREFIX           ?= $(ENV_PREFIX)/opt/$(PROJECT)
-VAR_PREFIX       ?= $(ENV_PREFIX)/var/opt
-DOC_PREFIX       ?= $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT)
+PREFIX           ?= $(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
+VAR_PREFIX       ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)opt
+DOC_PREFIX       ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT)
 EXE_PREFIX       ?= $(PREFIX)
-INIT_PREFIX      ?= $(ENV_PREFIX)/etc
-SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/sysconfig
-CONFIG_DIR       ?= /etc/opt/$(PROJECT)
+INIT_PREFIX      ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
+SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
+CONFIG_DIR       ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
 
-IMAGEDIR         ?= $(PREFIX)/images
-CTRLDIR          ?= $(ENV_PREFIX)/etc/init.d
+IMAGEDIR         ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
+CTRLDIR          ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
 DAEMON_RUN_DIR   ?= $(VAR_PREFIX)/corefiles
-PROFILE_DIR      ?= $(ENV_PREFIX)/etc/profile.d
+PROFILE_DIR      ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d
 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
diff --git a/make/defs.mk b/make/defs.mk
index 226040b6..5a464801 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -17,6 +17,11 @@ include pre-local.mk
 endif
 
 # ----- standard variables
+ifeq ($(TARGET),mingw)
+FLAVOUR_PREFIX        ?= win32-
+FLAVOUR_PATH_PREFIX   ?= win32/
+FLAVOUR_PATH_SUFFIX   ?= /win32
+endif
 
 PROJECT               ?= $(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//'))
 PROJECT_CAPNAME        = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
@@ -208,24 +213,26 @@ LIBNAME               ?= $(PROJECT)
 LIBTYPE               ?= shared
 MEMBERS               += $(LIB_A)($(OBJ))
 SHOBJS                += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP))))
+INSTALL_LIBDIR        ?= $(EXE_PREFIX)/lib
+VERSION_SCRIPT         = $(BUILD_LIBDIR)/version.ldscript
 ifneq ($(TARGET),mingw)
 LIB_A                  = $(BUILD_LIBDIR)/lib$(LIBNAME).a
 SO_SUFFIX              = so.$(shell echo $(VERSION) | cut -d- -f1)
 LIB_SO                 = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
+LINKS_SO              += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
+INSTALLED_LINKS_SO    += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
+INSTALLED_LIB_SO       = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
+INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
 else
 LIB_A                  = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
+SO_SUFFIX              = dll
 LIB_DEF                = $(BUILD_LIBDIR)/$(LIBNAME).def
 MSVCPP_IMPLIB          = $(BUILD_LIBDIR)/$(LIBNAME).lib
-SO_SUFFIX              = dll.$(shell echo $(VERSION) | cut -d- -f1)
 LIB_SO                 = $(BUILD_LIBDIR)/$(LIBNAME).dll
-endif
-LINKS_SO              += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
-VERSION_SCRIPT         = $(BUILD_LIBDIR)/version.ldscript
-INSTALL_LIBDIR        ?= $(EXE_PREFIX)/lib
-INSTALLED_LIB_SO       = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
-INSTALLED_SHOBJS      += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
-INSTALLED_LINKS_SO    += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
+INSTALLED_LIB_SO       = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX)
 INSTALLED_LIB_A        = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
+endif
+INSTALLED_SHOBJS      += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
 INSTALLED_ALL_LIBS     = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
 INSTALLED_LIB          = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
 	$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS))