From 057da54566f6ca8f0e795ec53fdd569607d61758 Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Tue, 11 Nov 2025 15:58:03 +0000 Subject: [PATCH] build: Fix distcheck by hardcoding non absolute paths Pkg-config gives out absolute paths that don't fare well with distcheck that needs to install files into its own prefix. Disable cups for distcheck as well so that only dbus needs this handling. You can learn more about this type of issue here. https://bugzilla.redhat.com/show_bug.cgi?id=1123963 See-Also: 9cc8b97b8 ("build: obexd: Fix make distcheck") --- Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 708e2ff14..e8b31a564 100644 --- a/Makefile.am +++ b/Makefile.am @@ -744,6 +744,7 @@ endif EXTRA_DIST += $(manual_pages) $(patsubst %.1,%.rst, \ $(patsubst %.8,%.rst,$(manual_pages))) +# pkg-config gives absolute paths that do not work with distcheck that wants to use its own $(prefix) AM_DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ --enable-health \ --enable-midi \ @@ -751,7 +752,13 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \ --enable-mesh \ --enable-btpclient \ --disable-systemd \ - --disable-udev + --disable-udev \ + --disable-cups \ + --with-dbusconfdir=$${dc_install_base}/$(DBUS_CONFDIR) \ + --with-dbussystembusdir=$${dc_install_base}/$(DBUS_SYSTEMBUSDIR) \ + --with-dbussessionbusdir=$${dc_install_base}/$(DBUS_SESSIONBUSDIR) + + DISTCLEANFILES = $(pkgconfig_DATA) $(unit_tests) $(manual_pages) -- 2.47.3