From bb8c053d9d41df3946b064384cbaa3ecb12f231f Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 5 Mar 2019 11:46:54 +0100 Subject: ECMGeneratePkgConfigFile: make all vars dependent on ${prefix} Summary: Note that the first test had a comment "without optional arguments" so I removed the INCLUDE_INSTALL_DIR variable to test what happens by default. The other tests still pass an absolute path there (which is unusual in practice, and breaks the idea of using ${prefix}). Test Plan: `ctest -R PkgConfig` passes Reviewers: kossebau, apol, cgiboudeaux Reviewed By: apol Subscribers: kde-frameworks-devel, kde-buildsystem, fazevedo Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D19538 --- tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc') diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc index 3e05c11e..cdc3b119 100644 --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/KCoreAddons +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include/KF5CoreAddons Name: KF5CoreAddons Description: KF5CoreAddons test Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons -Cflags: -I/usr/KCoreAddons +Libs: -L${prefix}/lib -lKF5CoreAddons +Cflags: -I${prefix}/include/KF5CoreAddons Requires: Qt5Core -- cgit v1.2.1