aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2024-07-22 08:32:00 +0000
committerIngo Klöcker <[email protected]>2024-07-22 08:32:00 +0000
commit5c095553e4344fba63bbf684b2468e36a7b891e8 (patch)
tree01fe0b950b3c0ecc488a3ce594c6efac8a57aaae
parentbuild,qt: Don't put generated camel-case headers in tarball (diff)
downloadgpgme-5c095553e4344fba63bbf684b2468e36a7b891e8.tar.gz
gpgme-5c095553e4344fba63bbf684b2468e36a7b891e8.zip
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
-rw-r--r--lang/qt/src/Makefile.am8
1 files 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