diff options
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index b94bc1d412..34982819b9 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -84,12 +84,7 @@ do_install () { | |||
84 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 84 | PACKAGES =+ "${PN}-lib ${PN}-libimage" |
85 | 85 | ||
86 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" | 86 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" |
87 | FILES_${PN} += "${libdir}/cups/backend \ | 87 | FILES_${PN} += "${libexecdir}/cups/ \ |
88 | ${libdir}/cups/cgi-bin \ | ||
89 | ${libdir}/cups/filter \ | ||
90 | ${libdir}/cups/monitor \ | ||
91 | ${libdir}/cups/notifier \ | ||
92 | ${libdir}/cups/daemon \ | ||
93 | " | 88 | " |
94 | 89 | ||
95 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | 90 | FILES_${PN}-lib = "${libdir}/libcups.so.*" |
@@ -107,5 +102,5 @@ CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" | |||
107 | 102 | ||
108 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | 103 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" |
109 | cups_sysroot_preprocess () { | 104 | cups_sysroot_preprocess () { |
110 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' | 105 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libexecdir}/cups:' |
111 | } | 106 | } |