From 24ae432b1a3906956381d83c1984687e45c5a1d1 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 22 Sep 2011 12:12:09 -0500 Subject: 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. Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-extended/cups/cups14.inc | 20 ++++++++++++++------ meta/recipes-extended/cups/cups_1.4.6.bb | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'meta/recipes-extended/cups') diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index e64f239a6a..48f493d6c7 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc @@ -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) diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb index fd20dcceeb..0dc2d4a26b 100644 --- a/meta/recipes-extended/cups/cups_1.4.6.bb +++ b/meta/recipes-extended/cups/cups_1.4.6.bb @@ -1,6 +1,6 @@ require cups14.inc -PR = "r1" +PR = "r2" DEPENDS += "libusb \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -- cgit 1.2.3-korg