diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-06 21:47:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-02-06 21:47:39 +0100 |
| commit | 3e8e9b4ae76d9b461bfd748c61450156158768f7 (patch) | |
| tree | 337ba11f1d3dc4feee077d453111a1274466fa51 /rules/cups.make | |
| parent | de9fa4b11393c77fb9ca9f17fd1c0df266b61ea4 (diff) | |
| download | ptxdist-3e8e9b4ae76d9b461bfd748c61450156158768f7.tar.gz ptxdist-3e8e9b4ae76d9b461bfd748c61450156158768f7.tar.xz | |
cups: fix installing cups.conf
If /etc/dbus-1/ does not exist, then cups.conf is not installed.
Add the upstream patches that ensure that -with-dbusdir= actually works and
set it. Use /usr/share/dbus-1/ like all other packages instead of
/etc/dbus-1/.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/cups.make')
| -rw-r--r-- | rules/cups.make | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rules/cups.make b/rules/cups.make index 37f5f6914..297fe37e4 100644 --- a/rules/cups.make +++ b/rules/cups.make @@ -86,6 +86,7 @@ CUPS_CONF_OPT += \ --disable-default-shared \ --disable-raw-printing \ --$(call ptx/endis,PTXCONF_CUPS_WEBINTERFACE)-webif \ + --with-dbusdir=/usr/share/dbus-1 \ --with-components=all \ --with-cachedir=/var/cache \ --with-logdir=/var/log \ @@ -153,7 +154,8 @@ ifdef PTXCONF_CUPS_SSL endif ifdef PTXCONF_CUPS_DBUS - @$(call install_alternative, cups, root, root, 0644, /etc/dbus-1/system.d/cups.conf) + @$(call install_alternative, cups, root, root, 0644, \ + /usr/share/dbus-1/system.d/cups.conf) endif # ----- libraries |