From e46748a0d18b8a6d26e6b386f64a99a5cdc6a6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Wed, 10 Jul 2024 23:28:27 +0200 Subject: [PATCH] build,cpp: Fix include paths in forwarding headers in gpgme++ folder * lang/cpp/src/Makefile.am (build rule for copied headers): Write abs_srcdir instead of srcdir in the generated headers. -- The generated include paths lacked a "../" if srcdir was relative. This lead to self-including includes for in-source builds. Including the real headers with their absolute paths fixes this. GnuPG-bug-id: 7110 --- lang/cpp/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am index a2edb49e..fd30ce21 100644 --- a/lang/cpp/src/Makefile.am +++ b/lang/cpp/src/Makefile.am @@ -92,7 +92,7 @@ copied_headers = $(gpgmepp_headers:%=gpgme++/%) $(interface_headers:%=gpgme++/%) $(copied_headers): Makefile.am mkdir -p $(builddir)/gpgme++/interfaces - echo -n "#include \"$(srcdir)" > "$@" + echo -n "#include \"$(abs_srcdir)" > "$@" echo -n "$@" | sed "s/gpgme++//" >> "$@" echo "\"" >> "$@"