From 55321abdcd06b0246b59dd2d94559a293763a894 Mon Sep 17 00:00:00 2001
From: Will Thompson <wjt@endlessm.com>
Date: Fri, 15 Mar 2019 10:18:17 +0000
Subject: data: set @localstatedir@ in tmpfiles.d/colord.conf

It's not guaranteed to be /var.
---
 data/colord.conf.in | 4 ++--
 data/meson.build    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/colord.conf.in b/data/colord.conf.in
index 7260751..7e2617f 100644
--- a/data/colord.conf.in
+++ b/data/colord.conf.in
@@ -1,2 +1,2 @@
-d /var/lib/colord 0755 @daemon_user@ @daemon_user@
-d /var/lib/colord/icc 0755 @daemon_user@ @daemon_user@
+d @localstatedir@/lib/colord 0755 @daemon_user@ @daemon_user@
+d @localstatedir@/lib/colord/icc 0755 @daemon_user@ @daemon_user@
diff --git a/data/meson.build b/data/meson.build
index 00ac6ec..1cdb7bb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -13,10 +13,11 @@ if get_option('bash_completion')
 endif
 
 con2 = configuration_data()
+con2.set('localstatedir', localstatedir)
 con2.set('servicedir', libexecdir)
 con2.set('daemon_user', get_option('daemon_user'))
 
-# replace @servicedir@ and @daemon_user@
+# replace @servicedir@, @daemon_user@ and @localstatedir@
 if get_option('systemd')
   configure_file(
     input : 'colord.service.in',
-- 
cgit v1.2.1