janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 21:13:56 +01:00
Code Activity

defs*.mk: Add FLAVOUR_(PREFIX|PATH_PREFIX|PATH_SUFFIX)

Browse source
This commit is contained in:
Jan Lindemann 2007-08-28 23:55:32 +00:00 • committed by Jan Lindemann
commit 946aaa27fb
3 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs-dev.mk
View file

@ -5,19 +5,19 @@
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #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 VAR_PREFIX ?= $(PREFIX)/var
DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT) DOC_PREFIX ?= $(PREFIX)/doc/$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX) INIT_PREFIX ?= $(EXE_PREFIX)
SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc$(FLAVOUR_PATH_SUFFIX)
IMAGEDIR ?= $(MODDIR)/../../images IMAGEDIR ?= $(MODDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin CTRLDIR ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME) DAEMON_RUN_DIR ?= $(ENV_PREFIX)/$(HOME)
PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d PROFILE_DIR ?= $(ENV_PREFIX)/$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
PIDDIR ?= $(VAR_PREFIX)/run PIDDIR ?= $(VAR_PREFIX)/$(FLAVOUR_PATH_PREFIX)run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
WORKING_DIR ?= $(ENV_PREFIX)/$(HOME) WORKING_DIR ?= $(ENV_PREFIX)/$(HOME)
WORKING_DIR ?= $(VAR_PREFIX)/lock WORKING_DIR ?= $(VAR_PREFIX)/lock

18
make/defs-dist.mk
View file

@ -5,18 +5,18 @@
# -- files # -- files
#CONTRIBDIR ?= $(TOPDIR)/contrib #CONTRIBDIR ?= $(TOPDIR)/contrib
PREFIX ?= $(ENV_PREFIX)/opt/$(PROJECT) PREFIX ?= $(ENV_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
VAR_PREFIX ?= $(ENV_PREFIX)/var/opt VAR_PREFIX ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)opt
DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT) DOC_PREFIX ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT)
EXE_PREFIX ?= $(PREFIX) EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(ENV_PREFIX)/etc INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/sysconfig SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= /etc/opt/$(PROJECT) CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
IMAGEDIR ?= $(PREFIX)/images IMAGEDIR ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
CTRLDIR ?= $(ENV_PREFIX)/etc/init.d CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles 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 PIDDIR ?= $(VAR_PREFIX)/run
DOWNLOADDIRS ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT) 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)/coredumps

23
make/defs.mk
View file

@ -17,6 +17,11 @@ include pre-local.mk
endif endif
# ----- standard variables # ----- 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 ?= $(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//'))
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g') PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
@ -208,24 +213,26 @@ LIBNAME ?= $(PROJECT)
LIBTYPE ?= shared LIBTYPE ?= shared
MEMBERS += $(LIB_A)($(OBJ)) MEMBERS += $(LIB_A)($(OBJ))
SHOBJS += $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(SRC_ALL_CPP)))) 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) ifneq ($(TARGET),mingw)
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1) SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX) 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 else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
SO_SUFFIX = dll
LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def LIB_DEF = $(BUILD_LIBDIR)/$(LIBNAME).def
MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib MSVCPP_IMPLIB = $(BUILD_LIBDIR)/$(LIBNAME).lib
SO_SUFFIX = dll.$(shell echo $(VERSION) | cut -d- -f1)
LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
endif INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX)
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_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
endif
INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS))