diff options
-rw-r--r-- | meta/recipes-extended/cups/cups14.inc | 5 | ||||
-rw-r--r-- | meta/recipes-extended/cups/cups_1.4.6.bb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-extended/cups/cups14.inc b/meta/recipes-extended/cups/cups14.inc index 2bf3ecfd6f..7c1968220d 100644 --- a/meta/recipes-extended/cups/cups14.inc +++ b/meta/recipes-extended/cups/cups14.inc | |||
@@ -91,3 +91,8 @@ FILES_${PN} += "${datadir}/doc/cups/images \ | |||
91 | ${datadir}/doc/cups/*.css \ | 91 | ${datadir}/doc/cups/*.css \ |
92 | ${datadir}/icons/ \ | 92 | ${datadir}/icons/ \ |
93 | " | 93 | " |
94 | |||
95 | SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" | ||
96 | cups_sysroot_preprocess () { | ||
97 | sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' | ||
98 | } | ||
diff --git a/meta/recipes-extended/cups/cups_1.4.6.bb b/meta/recipes-extended/cups/cups_1.4.6.bb index 0dc2d4a26b..ec555d791d 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 @@ | |||
1 | require cups14.inc | 1 | require cups14.inc |
2 | 2 | ||
3 | PR = "r2" | 3 | PR = "r3" |
4 | DEPENDS += "libusb \ | 4 | DEPENDS += "libusb \ |
5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 5 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
6 | 6 | ||