janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make: Add support for installation file type PKG_CONFIG

Browse source
This commit is contained in:
Jan Lindemann 2012-04-28 16:01:18 +00:00 • committed by Jan Lindemann
commit 05be1d8ead
4 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -27,6 +27,7 @@ CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME)
PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
INSTALL_CRONTABDIR ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
INSTALL_PKG_CONFIGDIR ?= $(CONFIG_DIR)/pkgconfig
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)
@ -192,6 +193,12 @@ KIO_PROTOCOLMODE ?= 664
KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE)
PKG_CONFIGOWNER ?= $(CFGOWNER)
PKG_CONFIGGROUP ?= $(CFGGROUP)
PKG_CONFIGMODE ?= 664
PKG_CONFIGDIROWNER ?= $(CFGDIROWNER)
PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER)
PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options

7
make/defs-dist.mk
View file

@ -27,6 +27,7 @@ CTRLDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
DAEMON_RUN_DIR ?= $(VAR_PREFIX)/corefiles
PROFILE_DIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)profile.d
INSTALL_CRONTABDIR ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)cron.d
INSTALL_PKG_CONFIGDIR ?= $(ENV_PREFIX)/usr/lib/pkgconfig
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
@ -193,6 +194,12 @@ KIO_PROTOCOLMODE ?= 664
KIO_PROTOCOLDIROWNER ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRGROUP ?= $(CFGDIROWNER)
KIO_PROTOCOLDIRMODE ?= $(CFGDIRMODE)
PKG_CONFIGOWNER ?= $(CFGOWNER)
PKG_CONFIGGROUP ?= $(CFGGROUP)
PKG_CONFIGMODE ?= 664
PKG_CONFIGDIROWNER ?= $(CFGDIROWNER)
PKG_CONFIGDIRGROUP ?= $(CFGDIROWNER)
PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options

8
make/defs.mk
View file

@ -479,6 +479,14 @@ BUILD_CRONTABDIR = $(TOPDIR)/cron.d
INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))
endif
# -- PKG_CONFIG
ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(wildcard *.pc)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
endif
# ==
ifeq ($(DEVELOPMENT),true)

4
make/make.mk
View file

@ -16,8 +16,8 @@ ifneq ($(wildcard pckg-defs.mk),)
INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
endif
all:
install: install_MAKE $(INSTALLED_PKG_MK)
all: build_PKG_CONFIG
install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
clean: textclean localclean doneclean
test: