From 8597e3b87d03472781cb88f26102cd98413e4794 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 27 Jan 2016 12:58:49 +0000
Subject: [PATCH] defs.mk, make.mk: Fix package config installation from
 installed ytools

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

diff --git a/make/defs.mk b/make/defs.mk
index cae2daea..4637679c 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -567,7 +567,13 @@ endif
 ifneq ($(TARGET),mingw)
 INSTALLATION_FILE_TYPES += PKG_CONFIG
 PKG_CONFIG            += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
+ifeq ($(DEVELOPMENT),true)
 BUILD_PKG_CONFIGDIR    = $(MODDIR)/pkgconfig
+else
+BUILD_PKG_CONFIGDIR    = $(TOPDIR)/make
+endif
+LOCAL_PKG_CONFIG       = $(PROJECT).pc
+BUILD_PKG_CONFIG       = $(BUILD_PKG_CONFIGDIR)/$(LOCAL_PKG_CONFIG)
 INSTALLED_PKG_CONFIG   = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
 endif
 
@@ -1764,8 +1770,8 @@ endif
 #PREREQ_RUN                ?= $(PREREQ_INSTALL)
 
 # TODO: remove this
-PREREQ_BUILD              += $(PREREQ_RUN)
-PREREQ_BUILD              += $(PREREQ_INSTALL)
+#PREREQ_BUILD              += $(PREREQ_RUN)
+#PREREQ_BUILD              += $(PREREQ_INSTALL)
 
 ifeq ($(USE_SNDFILE),true)
 LIBFLAGS                  += -lsndfile
diff --git a/make/make.mk b/make/make.mk
index 495befa4..62f6fa1c 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -6,8 +6,8 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 
-LOCAL_PKG_CONFIG = $(PROJECT).pc
-BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
+#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),)
@@ -19,7 +19,8 @@ ifneq ($(wildcard pckg-defs.mk),)
 INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
 endif
 
-all: $(BUILD_PKG_CONFIG)
+#all: $(BUILD_PKG_CONFIG)
+all: build_PKG_CONFIG
 install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
 clean: textclean localclean doneclean clean.pkg-config
 test:
@@ -56,7 +57,7 @@ $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_D
 		> $@.tmp
 	mv $@.tmp $@
 
-#$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
+$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
 	
 clean.pkg-config:
 	rm -f *.pc $(BUILD_PKG_CONFIG)