zlib: install pc file

Joshua Immanuel reported, and provided a patch to fix, that our custom
autotooling for zlib does not install the pc file.

Fixes [YOCTO #1983]

Patch-from: Joshua Immanuel <josh@hipro.co.in>
(From OE-Core rev: 37fbe2e1a706af634f400213b9fb4c6f0670c15e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 11 insertions, 3 deletions

diff --git a/meta/recipes-core/zlib/files/Makefile.am b/meta/recipes-core/zlib/files/Makefile.am
index b66d299d8f..db072dfe4a 100644
--- a/meta/recipes-core/zlib/files/Makefile.am
+++ b/meta/recipes-core/zlib/files/Makefile.am
@@ -7,3 +7,6 @@ libz_la_SOURCES = adler32.c compress.c crc32.c gzlib.c gzclose.c gzread.c \
 libz_la_LDFLAGS = -version-number 1:2:5 --version-script zlib.map
 
 include_HEADERS = zconf.h zlib.h zlibdefs.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = zlib.pc
diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac
index 4761b7ef28..5792b15103 100644
--- a/meta/recipes-core/zlib/files/configure.ac
+++ b/meta/recipes-core/zlib/files/configure.ac
@@ -43,6 +43,11 @@ cat > zlibdefs.h << EOF
 #endif
 EOF
 
-AC_CONFIG_FILES([Makefile])
+AC_SUBST(sharedlibdir,$libdir)
+
+AC_CONFIG_FILES([
+Makefile
+zlib.pc
+])
 
 AC_OUTPUT
diff --git a/meta/recipes-core/zlib/zlib_1.2.5.bb b/meta/recipes-core/zlib/zlib_1.2.5.bb
index bca400ce4b..14b3987078 100644
--- a/meta/recipes-core/zlib/zlib_1.2.5.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.5.bb
@@ -7,12 +7,12 @@ LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=084e9c30e4e6272c3b057b13c6467f3d"
 
 DEPENDS = "libtool-cross"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
            file://configure.ac \
            file://Makefile.am \
-           file://fix.inverted.LFS.logic.patch"
+           file://fix.inverted.LFS.logic.patch"
 
 SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
 SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"