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