cups: Fix recipe to use the correct cups directories

${libdir} is not used, instead they use a common ${exec_prefix}/lib
directory structure for helpers, filters, renderers, etc.

(From OE-Core rev: 24ae432b1a3906956381d83c1984687e45c5a1d1)

(From OE-Core rev: 72da8109de9c2b1e237655706cdf4de447d38393)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle 2011-09-22 12:12:09 -05:00 committed by Richard Purdie
parent b137421cfc
commit ff047d3a77
2 changed files with 15 additions and 7 deletions

View File

@ -64,16 +64,24 @@ python do_package_append() {
PACKAGES =+ "${PN}-lib ${PN}-libimage"
FILES_${PN} += "${exec_prefix}/lib/cups/backend \
${exec_prefix}/lib/cups/cgi-bin \
${exec_prefix}/lib/cups/filter \
${exec_prefix}/lib/cups/monitor \
${exec_prefix}/lib/cups/notifier \
${exec_prefix}/lib/cups/daemon \
"
FILES_${PN}-lib = "${libdir}/libcups.so.*"
FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
${libdir}/cups/cgi-bin/.debug \
${libdir}/cups/filter/.debug \
${libdir}/cups/monitor/.debug \
${libdir}/cups/notifier/.debug \
${libdir}/cups/daemon/.debug \
FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \
${exec_prefix}/lib/cups/cgi-bin/.debug \
${exec_prefix}/lib/cups/filter/.debug \
${exec_prefix}/lib/cups/monitor/.debug \
${exec_prefix}/lib/cups/notifier/.debug \
${exec_prefix}/lib/cups/daemon/.debug \
"
#package the html for the webgui inside the main packages (~1MB uncompressed)

View File

@ -1,6 +1,6 @@
require cups14.inc
PR = "r1"
PR = "r2"
DEPENDS += "libusb \
${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"