From 5c095553e4344fba63bbf684b2468e36a7b891e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Mon, 22 Jul 2024 10:32:00 +0200 Subject: [PATCH] build,qt: Fix include path in CMake files * lang/qt/src/Makefile.am (QGpgmeConfig.cmake, QGpgmeQt6Config.cmake): Use new variables includeprefix{5,6} instead of replaced variable includeprefix. -- GnuPG-bug-id: 7205 --- lang/qt/src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index 881e8827..74eca04d 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -415,12 +415,12 @@ if HAVE_W32_SYSTEM QGpgmeConfig.cmake: QGpgmeConfig-w32.cmake.in sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \ sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \ - sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix5)|g' > $@ else QGpgmeConfig.cmake: QGpgmeConfig.cmake.in sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \ sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \ - sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix5)|g' > $@ endif endif if WANT_QT6 @@ -428,12 +428,12 @@ if HAVE_W32_SYSTEM QGpgmeQt6Config.cmake: QGpgmeQt6Config-w32.cmake.in sed -e 's|[@]resolved_bindir@|$(bindir)|g' < "$<" | \ sed -e 's|[@]resolved_libdir@|$(libdir)|g' | \ - sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix6)|g' > $@ else QGpgmeQt6Config.cmake: QGpgmeQt6Config.cmake.in sed -e 's|[@]resolved_libdir@|$(libdir)|g' < "$<" | \ sed -e 's|[@]libsuffix@|$(libsuffix)|g' | \ - sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix)|g' > $@ + sed -e 's|[@]resolved_includedir@|$(includedir)/$(includeprefix6)|g' > $@ endif endif