From 231e128f91f6cc7f23f5d2392dffaa7857f1dcfa Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Thu, 19 Jul 2007 11:32:04 +0200
Subject: [PATCH] Unfortunately, libraries with public API need an extra rule
 for their .pc.

---
 build/Makebottom | 6 +++---
 charset/Makefile | 1 +
 images/Makefile  | 1 +
 lib/Makefile     | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/Makebottom b/build/Makebottom
index b15ce14d..49714a75 100644
--- a/build/Makebottom
+++ b/build/Makebottom
@@ -72,7 +72,7 @@ $(o)/%.pc: $(s)/%.pc $(o)/%.$(LS)
 
 ifdef CONFIG_INSTALL_API
 
-API_ROOT:=$(shell cd run && pwd)
+API_ROOT:=$(shell pwd)/run
 INSTALL_RUNDIRS+=include lib/pkgconfig
 api: $(API_INCLUDES) $(addprefix run/lib/pkgconfig/,$(addsuffix .pc,$(API_LIBS)))
 
@@ -80,8 +80,8 @@ $(o)/%/.include-stamp:
 	$(Q)$(s)/build/install-includes $(<D) run/include/$(IDST) $(?F)
 	$(Q)touch $@
 
-run/lib/pkgconfig/%.pc: $(o)/pkgconfig/%.pc
-	$(M)PC $@
+run/lib/pkgconfig/%.pc:		# RHS supplied in the sub-makefile
+	$(M)PC-API $@
 	$(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_ROOT)/lib@;s@^incdir=.*@incdir=$(API_ROOT)/include@"
 
 else
diff --git a/charset/Makefile b/charset/Makefile
index 9c393be5..8e121369 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -13,6 +13,7 @@ API_LIBS+=libcharset
 API_INCLUDES+=$(o)/charset/.include-stamp
 $(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
 $(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc
 
 build_charsets:
 	cd $(s)/charset && sh misc/generate
diff --git a/images/Makefile b/images/Makefile
index ce9c23bc..1b9111e4 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -78,3 +78,4 @@ API_LIBS+=libimages
 API_INCLUDES+=$(o)/images/.include-stamp
 $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
 $(o)/images/.include-stamp: IDST=images
+run/lib/pkgconfig/libimages.pc: $(o)/images/libimages.pc
diff --git a/lib/Makefile b/lib/Makefile
index 2c3eb6c4..57fef8f0 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -115,6 +115,7 @@ API_LIBS+=libucw
 API_INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
 $(o)/lib/.include-stamp: IDST=lib
+run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_PERL
 include $(s)/lib/perl/Makefile
-- 
2.39.2