janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

defs.mk: Make common PKG_CONFIG build dir opt-in #152

Merged
Jan Lindemann merged 1 commit from jan/fix/20261020-defs-mk-make-common-pkg-config-build-dir-opt-in into master 2026-10-20 10:22:11 +02:00 AGit
Conversation 0 Commits 1 Files changed 1 +5 -5
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs.mk
View file

@ -491,11 +491,11 @@ endif
ifeq ($(CREATE_PKG_CONFIG),true) ifeq ($(CREATE_PKG_CONFIG),true)
INSTALLATION_FILE_TYPES += PKG_CONFIG INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG))) PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true) # Having BUILD_PKG_CONFIGDIR point to $(TOPDIR)/make makes it a build-time
BUILD_PKG_CONFIGDIR = $(JWBDIR)/pkgconfig # no-op. Override BUILD_PKG_CONFIGDIR to $(JWBDIR)/pkgconfig if you want a
else # self-contained (i.e. non-installed) build over multiple projects to share
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make # a common PKG_CONFIG directory.
endif BUILD_PKG_CONFIGDIR ?= $(TOPDIR)/make
LOCAL_PKG_CONFIG = $(PROJECT).pc LOCAL_PKG_CONFIG = $(PROJECT).pc
# As of now, this is not used by any downstream project, so disable it to reduce complexity. # As of now, this is not used by any downstream project, so disable it to reduce complexity.
#BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG) #BUILD_PKG_CONFIG = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG)