[oe-commits] [meta-openembedded] 11/12: apache2: set files layout to debian style

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 8b021f35e343d5ea3b44ed9f9da8c9db6998bf3b
Author: Yi Zhao <yi.zhao at windriver.com>
AuthorDate: Fri Aug 24 11:40:11 2018 +0800

    apache2: set files layout to debian style
    
    The default layout installs log files to /var/apache2/logs. But we
    assume the log directory is /var/log/apache2 in volatile.conf. Specify
    the layout to debian style to set the correct the log directory.
    
    Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
index 6642f2b..a92ec54 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb
@@ -58,10 +58,12 @@ EXTRA_OECONF = "--enable-ssl \
     --libexecdir=${libdir}/${BPN}/modules \
     ap_cv_void_ptr_lt_long=no \
     --enable-mpms-shared \
-    ac_cv_have_threadsafe_pollset=no"
+    ac_cv_have_threadsafe_pollset=no \
+    --enable-layout=Debian \
+    --prefix=${base_prefix}/"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
-PACKAGECONFIG[selinux] = "--enable-selinux --enable-layout=Debian --prefix=${base_prefix}/,--disable-selinux,libselinux,libselinux"
+PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
 PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
 PACKAGECONFIG[zlib] = "--enable-deflate --with-z=${STAGING_LIBDIR},,zlib,zlib"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.