From c480eeaaca73bee6c2feac5e925ab1687179e965 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 3 Jun 2019 09:06:41 +0000
Subject: [PATCH] defs.mk, make.mk: Add CREATE_PKG_CONFIG variable

It was possible for DEVEL_TARGETS to contain install_PKG_CONFIG without a
package config file being built, fixed that.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk |  4 ++++
 make/make.mk | 23 +++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 966a2d59..a08f8002 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -464,6 +464,10 @@ endif
 
 # -- PKG_CONFIG
 ifneq ($(findstring $(TARGET_OS),linux),)
+  CREATE_PKG_CONFIG         ?= true
+endif
+
+ifeq ($(CREATE_PKG_CONFIG),true)
   INSTALLATION_FILE_TYPES   += PKG_CONFIG
   PKG_CONFIG                += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
   ifeq ($(DEVELOPMENT),true)
diff --git a/make/make.mk b/make/make.mk
index ae3240f5..c4312867 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -14,14 +14,14 @@ include $(MODDIR)/make/cache.mk
 
 ifneq ($(CREATE_DEVEL),false)
   MKFILES                   += $(wildcard project.conf)
-  DEVEL_TARGETS             += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
+  DEVEL_TARGETS             += install_MAKE $(INSTALLED_PKG_MK)
+  ifeq ($(CREATE_PKG_CONFIG),true)
+    DEVEL_TARGETS           += install_PKG_CONFIG
+  endif
 endif
 
 include $(MODDIR)/make/rules.mk
 
-#LOCAL_PKG_CONFIG            = $(PROJECT).pc
-# BUILD_PKG_CONFIG           = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
-
 INSTALL_PCKG_DEPS_DIR        = $(ENV_PREFIX)$(MODDIR)/make/deps.d
 ifneq ($(wildcard pckg-deps.mk),)
   INSTALLED_PKG_MK          += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk
@@ -32,8 +32,7 @@ ifneq ($(wildcard pckg-defs.mk),)
   INSTALLED_PKG_MK          += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
 endif
 
-#all: $(BUILD_PKG_CONFIG)
-ifneq ($(findstring PKG_CONFIG,$(INSTALLATION_FILE_TYPES)),)
+ifeq ($(CREATE_PKG_CONFIG),true)
 all: build_PKG_CONFIG
 endif
 install: $(DEVEL_TARGETS)
@@ -54,10 +53,12 @@ install-links:
 do-install-links:
 	@$(call install_links,MAKE)
 
-ifeq ($(EXPORT_PROJECT_LIB),true)
-  CREATE_PKG_CONFIG_OPTS    += -c "-I$(PROJECT_DIRPATH)/include"
-  CREATE_PKG_CONFIG_OPTS    += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
-endif
+ifeq ($(CREATE_PKG_CONFIG),true)
+
+  ifeq ($(EXPORT_PROJECT_LIB),true)
+    CREATE_PKG_CONFIG_OPTS  += -c "-I$(PROJECT_DIRPATH)/include"
+    CREATE_PKG_CONFIG_OPTS  += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
+  endif
 
 $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
 	/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \
@@ -75,5 +76,7 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
 
 $(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
 
+endif # ifeq ($(CREATE_PKG_CONFIG),true)
+
 clean.pkg-config:
 	$(RM) -f *.pc $(BUILD_PKG_CONFIG)