diff --git a/make/defs-dev.mk b/make/defs-dev.mk index f0f853e9..ced37f14 100644 --- a/make/defs-dev.mk +++ b/make/defs-dev.mk @@ -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 diff --git a/make/defs-dist.mk b/make/defs-dist.mk index 93fd6f6f..4c663126 100644 --- a/make/defs-dist.mk +++ b/make/defs-dist.mk @@ -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 diff --git a/make/defs.mk b/make/defs.mk index 481a93df..0f648411 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -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) diff --git a/make/make.mk b/make/make.mk index 8ac1684c..90a4da25 100644 --- a/make/make.mk +++ b/make/make.mk @@ -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: