From 99f95a1ea9c86b8f0d99355a97c289dc4756a44b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 14 May 2019 13:50:59 +0200 Subject: build-sys: add --with-pkgconfigdir It seems we need a way how to override the default pkg-config install directory. default: $ ./configure $ grep 'pkgconfigdir =' Makefile pkgconfigdir = ${usrlib_execdir}/pkgconfig user-defined: $ ./configure --with-pkgconfigdir=/usr/share/pkgconfig $ grep 'pkgconfigdir =' Makefile $ pkgconfigdir = /usr/share/pkgconfig Addresses: https://github.com/karelzak/util-linux/issues/793 Signed-off-by: Karel Zak --- Makefile.am | 2 -- configure.ac | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index adf87804b..51c649909 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,6 @@ ul_libfdisk_incdir = $(top_builddir)/libfdisk/src ul_libuuid_incdir = $(top_srcdir)/libuuid/src -pkgconfigdir = $(usrlib_execdir)/pkgconfig - bashcompletiondir = @bashcompletiondir@ dist_noinst_HEADERS = diff --git a/configure.ac b/configure.ac index c314edd65..7f462f910 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,7 @@ m4_ifndef([PKG_PROG_PKG_CONFIG], environment variable AL_OPTS="-I/other/macro/dir" before running ./autogen.sh or autoreconf again. Make sure pkg-config is installed.])]) PKG_PROG_PKG_CONFIG +PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig']) GTK_DOC_CHECK([1.10]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -- cgit v1.2.3-55-g7522