| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | @CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file |
| 2 | conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to |
| 3 | avoid the conflict. |
| 4 | |
| 5 | Upstream-Status: Inappropriate [OE specific] |
| 6 | |
| 7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 8 | |
| 9 | diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in |
| 10 | index 4a78ba6..03c6582 100644 |
| 11 | --- a/conf/cups-files.conf.in |
| 12 | +++ b/conf/cups-files.conf.in |
| 13 | @@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log |
| 14 | #RequestRoot @CUPS_REQUESTS@ |
| 15 | |
| 16 | # Location of helper programs... |
| 17 | -#ServerBin @CUPS_SERVERBIN@ |
| 18 | +#ServerBin |
| 19 | |
| 20 | # SSL/TLS keychain for the scheduler... |
| 21 | #ServerKeychain @CUPS_SERVERKEYCHAIN@ |