From 7dbda1887aa19ab720aff22312f4caff2d575f62 Mon Sep 17 00:00:00 2001
|
From: Kai Kang <kai.kang@windriver.com>
|
Date: Wed, 3 Oct 2018 00:27:11 +0800
|
Subject: [PATCH 4/4] cups: fix multilib install file conflicts
|
|
@CUPS_SERVERBIN@ is ${libdir} related that causes multilib install file
|
conflict. Remove @CUPS_SERVERBIN@ from the comment line of cups-files.conf to
|
avoid the conflict.
|
|
Upstream-Status: Inappropriate [OE specific]
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
conf/cups-files.conf.in | 2 +-
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
diff --git a/conf/cups-files.conf.in b/conf/cups-files.conf.in
|
index 4a78ba6..03c6582 100644
|
--- a/conf/cups-files.conf.in
|
+++ b/conf/cups-files.conf.in
|
@@ -73,7 +73,7 @@ PageLog @CUPS_LOGDIR@/page_log
|
#RequestRoot @CUPS_REQUESTS@
|
|
# Location of helper programs...
|
-#ServerBin @CUPS_SERVERBIN@
|
+#ServerBin
|
|
# SSL/TLS keychain for the scheduler...
|
#ServerKeychain @CUPS_SERVERKEYCHAIN@
|
--
|
2.17.1
|
