2 files changed, 7 insertions, 10 deletions

diff --git a/meta/classes/pkgconfig_stage.bbclass b/meta/classes/pkgconfig_stage.bbclass
deleted file mode 100644
index bd5bd81670..0000000000
--- a/meta/classes/pkgconfig_stage.bbclass
+++ /dev/null
@@ -1,9 +0,0 @@
-SYSROOT_PREPROCESS_FUNCS += "pkgconfig_sysroot_preprocess"
-
-pkgconfig_sysroot_preprocess () {
-        install -d ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR}
-        for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do
-                pcname=`basename $pc`
-                cat $pc > ${SYSROOT_DESTDIR}${PKG_CONFIG_DIR}/$pcname
-        done
-}
diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/packages/libgcrypt/libgcrypt.inc
index 6c46087045..08fe7992fa 100644
--- a/meta/packages/libgcrypt/libgcrypt.inc
+++ b/meta/packages/libgcrypt/libgcrypt.inc
@@ -14,10 +14,16 @@ DEPENDS = "libgpg-error"
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \
            file://add-pkgconfig-support.patch"
 
-inherit autotools binconfig pkgconfig pkgconfig_stage
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 
+# libgcrypt.pc is added locally and thus installed here
+do_install_append() {
+        install -d ${D}/${libdir}/pkgconfig
+        install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
+}
+
 ARM_INSTRUCTION_SET = "arm"
 
 # move libgcrypt-config into -dev package