diff --git a/modules/ECMGeneratePkgConfigFile.cmake b/modules/ECMGeneratePkgConfigFile.cmake --- a/modules/ECMGeneratePkgConfigFile.cmake +++ b/modules/ECMGeneratePkgConfigFile.cmake @@ -158,12 +158,12 @@ if(IS_ABSOLUTE "${EGPF_INCLUDE_INSTALL_DIR}") set(PKGCONFIG_TARGET_INCLUDES "${EGPF_INCLUDE_INSTALL_DIR}") else() - set(PKGCONFIG_TARGET_INCLUDES "${CMAKE_INSTALL_PREFIX}/${EGPF_INCLUDE_INSTALL_DIR}") + set(PKGCONFIG_TARGET_INCLUDES "\${prefix}/${EGPF_INCLUDE_INSTALL_DIR}") endif() if(IS_ABSOLUTE "${EGPF_LIB_INSTALL_DIR}") set(PKGCONFIG_TARGET_LIBS "${EGPF_LIB_INSTALL_DIR}") else() - set(PKGCONFIG_TARGET_LIBS "${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR}") + set(PKGCONFIG_TARGET_LIBS "\${prefix}/${EGPF_LIB_INSTALL_DIR}") endif() set(PKGCONFIG_TARGET_DESCRIPTION "${EGPF_DESCRIPTION}") set(PKGCONFIG_TARGET_DEFINES "") @@ -179,14 +179,14 @@ file(WRITE ${PKGCONFIG_FILENAME} " prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} +exec_prefix=\${prefix} +libdir=\${prefix}/${EGPF_LIB_INSTALL_DIR} includedir=${PKGCONFIG_TARGET_INCLUDES} Name: ${PKGCONFIG_TARGET_LIBNAME} Description: ${PKGCONFIG_TARGET_DESCRIPTION} Version: ${PROJECT_VERSION} -Libs: -L${CMAKE_INSTALL_PREFIX}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} +Libs: -L\${prefix}/${EGPF_LIB_INSTALL_DIR} -l${PKGCONFIG_TARGET_LIBNAME} Cflags: -I${PKGCONFIG_TARGET_INCLUDES} ${PKGCONFIG_TARGET_DEFINES} Requires: ${PKGCONFIG_TARGET_DEPS} " diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons.pc --- 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 diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons2.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib +exec_prefix=${prefix} +libdir=${prefix}/lib includedir=/usr/KCoreAddons Name: KF5CoreAddons2 Description: Addons to QtCore Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons2 +Libs: -L${prefix}/lib -lKF5CoreAddons2 Cflags: -I/usr/KCoreAddons Requires: Qt5Core diff --git a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc --- a/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc +++ b/tests/ECMGeneratePkgConfigFile/KF5CoreAddons3.pc @@ -1,11 +1,12 @@ + prefix=/usr -exec_prefix=/usr -libdir=/usr/lib +exec_prefix=${prefix} +libdir=${prefix}/lib includedir=/usr/KCoreAddons Name: KF5CoreAddons3 Description: KF5CoreAddons3 library. Version: 5.43 -Libs: -L/usr/lib -lKF5CoreAddons3 +Libs: -L${prefix}/lib -lKF5CoreAddons3 Cflags: -I/usr/KCoreAddons Requires: Qt5Core diff --git a/tests/ECMGeneratePkgConfigFile/run_test.cmake.config b/tests/ECMGeneratePkgConfigFile/run_test.cmake.config --- a/tests/ECMGeneratePkgConfigFile/run_test.cmake.config +++ b/tests/ECMGeneratePkgConfigFile/run_test.cmake.config @@ -51,7 +51,6 @@ ecm_generate_pkgconfig_file(BASE_NAME KF5CoreAddons DESCRIPTION "KF5CoreAddons test" DEPS Qt5Core - INCLUDE_INSTALL_DIR /usr/KCoreAddons FILENAME_VAR OutputFile) compare_files(GENERATED ${OutputFile}