Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-2289-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v2] build: Fix distcheck
Date: Mon,  4 Mar 2024 13:11:57 -0500
Message-ID: <20240304181157.3170287-1-luiz.dentz@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This fixes the following errors:

/usr/bin/mkdir -p '/backend'
/usr/bin/mkdir: cannot create directory ‘/backend’: Permission denied
make[3]: *** [Makefile:4768: install-cupsPROGRAMS] Error 1
---
 Makefile.tools | 6 +++++-
 configure.ac   | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.tools b/Makefile.tools
index c17244677673..27a753762d1c 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -539,7 +539,11 @@ endif
 
 if CUPS
 
-cupsdir = $(CUPSDIR)
+if CUPS_SERVERBIN
+cupsdir = $(CUPS_SERVERBIN)/backend
+else
+cupsdir = $(libdir)/cups/backend
+endif
 
 cups_PROGRAMS = profiles/cups/bluetooth
 
diff --git a/configure.ac b/configure.ac
index af0e9900e732..6552154a86dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,13 @@ AC_ARG_ENABLE(cups, AS_HELP_STRING([--disable-cups],
                 [disable CUPS printer support]), [enable_cups=${enableval}])
 AM_CONDITIONAL(CUPS, test "${enable_cups}" != "no")
 if (test "${enable_cups}" != "no"); then
-   AC_SUBST(CUPSDIR, `$PKG_CONFIG cups --variable=cups_serverbin`/backend)
+	AC_MSG_CHECKING([cups directory])
+	cups_serverbin=`$PKG_CONFIG cups --variable=cups_serverbin`
+	AM_CONDITIONAL(CUPS_SERVERBIN, test "${cups_serverbin}" != "")
+	if (test "${cups_serverbin}" != ""); then
+		AC_SUBST(CUPS_SERVERBIN, ${cups_serverbin})
+	fi
+	AC_MSG_RESULT([${cups_serverbin}])
 fi
 
 AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
-- 
2.43.0