[oe-commits] [meta-openembedded] 05/13: nginx: fix install paths

[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 2c6a15af08a7ee27ee80011b53b080b0d4c9d422
Author: Gaylord Charles <gaylord.charles at veo-labs.com>
AuthorDate: Wed Sep 25 11:20:06 2019 +0200

    nginx: fix install paths
    
    Hello,
    
    This patch fixes Nginx install paths. I tried to build the native variant
    for testing purpose and had errors.
    
    Regards,
    Gaylord Charles
    
    >From b6dc845b645cc8667b2d89412c292c0801de9270 Mon Sep 17 00:00:00 2001
    From: Gaylord CHARLES <gaylord.charles at veo-labs.com>
    Date: Tue, 24 Sep 2019 18:56:45 +0200
    Subject: [PATCH] nginx: fix install paths
    
    - Use path variable instead of /usr
    - Replace the absolute path symlink with a relative one
    
    Signed-off-by: Gaylord CHARLES <gaylord.charles at veo-labs.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-webserver/recipes-httpd/nginx/nginx.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index e202e85..e2f6785 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -93,9 +93,9 @@ do_install () {
             >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
     fi
     install -d ${D}${sysconfdir}/${BPN}
-    ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run
+    ln -snf ../../var/run/${BPN} ${D}${sysconfdir}/${BPN}/run
     install -d ${D}${NGINX_WWWDIR}
-    mv ${D}/usr/html ${D}${NGINX_WWWDIR}/
+    mv ${D}${exec_prefix}/html ${D}${NGINX_WWWDIR}/
     chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR}
 
     install -d ${D}${sysconfdir}/init.d

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