aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/cups
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-09-22 12:12:09 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 21:00:48 +0100
commit24ae432b1a3906956381d83c1984687e45c5a1d1 (patch)
treecb04283af8de06c0164b474da7f1cdcd3833f1ea /meta/recipes-extended/cups
parent465a988e2370ec377875b599045f2a7bad913ac6 (diff)
downloadopenembedded-core-24ae432b1a3906956381d83c1984687e45c5a1d1.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/cups')
-rw-r--r--meta/recipes-extended/cups/cups14.inc20
-rw-r--r--meta/recipes-extended/cups/cups_1.4.6.bb2
2 files changed, 15 insertions, 7 deletions
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)}"