Diff between c01c40498cfb770d4282f31edd9d75bb53646efa and 15032315f35c44820952a9750baf58c2b4090b3f

Changed Files

File Additions Deletions Status
Makefile.tools +2 -1 modified
configure.ac +3 -0 modified

Full Patch

diff --git a/Makefile.tools b/Makefile.tools
index 044342e..c172446 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -538,7 +538,8 @@ endif
 endif
 
 if CUPS
-cupsdir = $(libdir)/cups/backend
+
+cupsdir = $(CUPSDIR)
 
 cups_PROGRAMS = profiles/cups/bluetooth
 
diff --git a/configure.ac b/configure.ac
index 6248eb0..af0e990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,6 +246,9 @@ AC_SUBST(UDEV_DIR, [${path_udevdir}])
 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)
+fi
 
 AC_ARG_ENABLE(mesh, AS_HELP_STRING([--enable-mesh],
 		[enable Mesh profile support]), [enable_mesh=${enableval}])