aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2019-04-20 01:56:02 +0200
committerKhem Raj <raj.khem@gmail.com>2019-04-27 10:13:07 -0700
commite7f13b68fe7e6b1fa595200e4ac10e05fe1b6b51 (patch)
tree765e658405d229342436b214f3f8ca03b2b2c08b /meta-webserver
parent90558c53168b8f295eaec7ab00a3b6cb68dd1e00 (diff)
downloadmeta-openembedded-contrib-e7f13b68fe7e6b1fa595200e4ac10e05fe1b6b51.tar.gz
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 <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb9
1 files changed, 7 insertions, 2 deletions
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