From 899a572b335528aabb769e5832318b0a3e910d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 17 Jul 2024 12:22:57 +0200 Subject: [PATCH] build,qt: Remove include directories on uninstall * lang/qt/src/Makefile.am (uninstall-include-dirs-qt5, uninstall-include-dirs-qt6): New targets. (uninstall_include_dirs_qt5, uninstall_include_dirs_qt6): New variables. (uninstall-local): Replace with... (uninstall-hook): ...this. Add new uninstall_include_dirs_qt* variables. -- We have to use uninstall-hook because uninstall-local runs before the header files have been removed from the include folders we want to remove. GnuPG-bug-id: 7205 --- lang/qt/src/Makefile.am | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am index 081adfd9..56da52d5 100644 --- a/lang/qt/src/Makefile.am +++ b/lang/qt/src/Makefile.am @@ -415,6 +415,12 @@ uninstall-cmake-files-qt5: -rm $(DESTDIR)$(libdir)/cmake/QGpgme/QGpgmeConfig.cmake -rmdir $(DESTDIR)$(libdir)/cmake/QGpgme/ uninstall_cmake_files_qt5 = uninstall-cmake-files-qt5 + +uninstall-include-dirs-qt5: + -rmdir $(DESTDIR)$(qgpgme5includedir) + -rmdir $(DESTDIR)$(camelcase5includedir) + -rmdir $(DESTDIR)$(includedir)/$(includeprefix5) +uninstall_include_dirs_qt5 = uninstall-include-dirs-qt5 endif if WANT_QT6 install-cmake-files-qt6: QGpgmeQt6Config.cmake QGpgmeQt6ConfigVersion.cmake @@ -430,11 +436,18 @@ uninstall-cmake-files-qt6: -rm $(DESTDIR)$(libdir)/cmake/QGpgmeQt6/QGpgmeQt6Config.cmake -rmdir $(DESTDIR)$(libdir)/cmake/QGpgmeQt6/ uninstall_cmake_files_qt6 = uninstall-cmake-files-qt6 + +uninstall-include-dirs-qt6: + -rmdir $(DESTDIR)$(qgpgme6includedir) + -rmdir $(DESTDIR)$(camelcase6includedir) + -rmdir $(DESTDIR)$(includedir)/$(includeprefix6) +uninstall_include_dirs_qt6 = uninstall-include-dirs-qt6 endif install-data-local: $(install_cmake_files_qt5) $(install_cmake_files_qt6) -uninstall-local: $(uninstall_cmake_files_qt5) $(uninstall_cmake_files_qt6) +uninstall-hook: $(uninstall_cmake_files_qt5) $(uninstall_cmake_files_qt6) \ + $(uninstall_include_dirs_qt5) $(uninstall_include_dirs_qt6) BUILT_SOURCES = $(qgpgme_moc_sources) $(camelcase_headers)