diff options
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 1b522d7d85..da320b1085 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc | |||
@@ -47,6 +47,7 @@ PACKAGECONFIG[gnutls] = "--with-tls=gnutls,--with-tls=no,gnutls" | |||
47 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" | 47 | PACKAGECONFIG[pam] = "--enable-pam --with-pam-module=unix, --disable-pam, libpam" |
48 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" | 48 | PACKAGECONFIG[systemd] = "--with-systemd=${systemd_system_unitdir},--without-systemd,systemd" |
49 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" | 49 | PACKAGECONFIG[xinetd] = "--with-xinetd=${sysconfdir}/xinetd.d,--without-xinetd,xinetd" |
50 | PACKAGECONFIG[webif] = "--enable-webif,--disable-webif" | ||
50 | 51 | ||
51 | EXTRA_OECONF = " \ | 52 | EXTRA_OECONF = " \ |
52 | --enable-dbus \ | 53 | --enable-dbus \ |
@@ -92,7 +93,7 @@ do_install () { | |||
92 | fi | 93 | fi |
93 | } | 94 | } |
94 | 95 | ||
95 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | 96 | PACKAGES =+ "${PN}-lib ${PN}-libimage ${PN}-webif" |
96 | 97 | ||
97 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" | 98 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" |
98 | FILES:${PN} += "${libexecdir}/cups/" | 99 | FILES:${PN} += "${libexecdir}/cups/" |
@@ -101,13 +102,10 @@ FILES:${PN}-lib = "${libdir}/libcups.so.*" | |||
101 | 102 | ||
102 | FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" | 103 | FILES:${PN}-libimage = "${libdir}/libcupsimage.so.*" |
103 | 104 | ||
104 | #package the html for the webgui inside the main packages (~1MB uncompressed) | 105 | # put the html for the web interface into its own PACKAGE |
106 | FILES:${PN}-webif += "${datadir}/doc/cups/ ${datadir}/icons/" | ||
107 | RRECOMMENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'webif', '${PN}-webif', '', d)}" | ||
105 | 108 | ||
106 | FILES:${PN} += "${datadir}/doc/cups/images \ | ||
107 | ${datadir}/doc/cups/*html \ | ||
108 | ${datadir}/doc/cups/*.css \ | ||
109 | ${datadir}/icons/ \ | ||
110 | " | ||
111 | CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" | 109 | CONFFILES:${PN} += "${sysconfdir}/cups/cupsd.conf" |
112 | 110 | ||
113 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" | 111 | MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/cups-config" |