Unfortunately, libraries with public API need an extra rule for their .pc.

diff --git a/build/Makebottom b/build/Makebottom
index b15ce14d0c68699dac96a6a8d4218aa7164fda2b..49714a754cf13cd97904c273861ace9afc6b4d66 100644 (file)
--- 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 9c393be5efe7efc2ea92e1fc58e1c5a270c17d63..8e121369474edae8b577c067cf6f94c836c547fc 100644 (file)
--- 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 ce9c23bca8805fd6f94989f341609ea20ce7aec4..1b9111e431d68b5003fdcf0f95c20f8397c4e1a8 100644 (file)
--- 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 2c3eb6c4c951a00cfef5dc6467c99e0d866304a8..57fef8f069a7a6a0f9bf7ecb234136082ca8773a 100644 (file)
--- 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