proftpd: fix do_install failure after libexecdir change

As of OE-Core commit id 406bd38b4232f9f399ef5ffe0b4fac72ed605a23
libexecdir has been changed to ${libdir}/${BPN}. As we are already
deleting ${libdir}/proftpd which is the same as ${libdir}/${BPN} in this
case, introduce a check to see if ${libexecdir} still exists before
attempting to remove it possibly a second time. This will handle if
libexecdir is set to its original value or a custom value in the distro
config.

Based on a patch by Kevin Strasser <kevin.strasser@linux.intel.com>

(From meta-openembedded rev: c75fc2573b88576b577946ff834b10446e591532)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 8624c16..7279cfb 100644 (file)
--- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -34,7 +34,8 @@ FTPGROUP = "ftp"
 
 do_install () {
        oe_runmake DESTDIR=${D} install
-       rmdir ${D}${libexecdir} ${D}${libdir}/proftpd ${D}${datadir}/locale
+       rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale
+       [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir}
        sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf
        sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf
        install -d ${D}${sysconfdir}/init.d