From e7f13b68fe7e6b1fa595200e4ac10e05fe1b6b51 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Sat, 20 Apr 2019 01:56:02 +0200 Subject: apache2: Correct packaging of build and doc related files The build related files (${datadir}/${BPN}/build and ${bindir}/apxs) belong in the -dev package, and the manual belong in the -doc package. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb index c6961ef9b8..2bd21f7d14 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb @@ -184,12 +184,17 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ # We override here rather than append so that .so links are # included in the runtime package rather than here (-dev) -# and to get icons, error into the -dev package -FILES_${PN}-dev = "${datadir}/${BPN}/icons \ +# and to get build, icons, error into the -dev package +FILES_${PN}-dev = "${datadir}/${BPN}/build \ + ${datadir}/${BPN}/icons \ ${datadir}/${BPN}/error \ ${includedir}/${BPN} \ + ${bindir}/apxs \ " +# Add the manual to -doc +FILES_${PN}-doc += " ${datadir}/${BPN}/manual" + FILES_${PN}-scripts += "${bindir}/dbmmanage" # Override this too - here is the default, less datadir -- cgit 1.2.3-korg