From 65e42b9492e8050c3b02ac4e7459154b7b32a534 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 30 Jan 2022 12:15:52 +0000 Subject: [PATCH] util-macros: set PKGCONFIG directory to /usr/lib/pkgconfig util-macros does not allow pkgconfigdir to be set independently of datadir. If datadir is changed to /usr/lib instead of /usr/share - then the aclocal files are also placed into /usr/lib - causing an error when aclocal and its subordinate programs are run. --- packages/x11/util/util-macros/package.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index 5b6420fa62..185f53b8ca 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -10,6 +10,11 @@ PKG_URL="http://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_V PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X.org autoconf utilities such as M4 macros." +pre_configure_target() { + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.am + sed -i 's|^pkgconfigdir = .*|pkgconfigdir = /usr/lib/pkgconfig|' ${PKG_BUILD}/Makefile.in +} + post_makeinstall_target() { rm -rf ${INSTALL}/usr }