[oe-commits] Paul Eggleton : modphp: fix for S != B

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 09ec4b8eaf9950824bc2bb9a1364e65b9a47bc54
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=09ec4b8eaf9950824bc2bb9a1364e65b9a47bc54

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Thu May  1 11:38:17 2014 +0100

modphp: fix for S != B

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-webserver/recipes-php/modphp/modphp5.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index d646fd1..a1d550d 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -51,8 +51,8 @@ PACKAGECONFIG[pgsql] = "--with-pgsql=${STAGING_DIR_TARGET}${exec_prefix},--witho
 acpaths = ""
 
 do_configure_prepend () {
-    rm -f build/libtool.m4 ltmain.sh aclocal.m4
-    find . -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
+    rm -f ${S}/build/libtool.m4 ${S}/ltmain.sh ${S}/aclocal.m4
+    find ${S} -name config.m4 | xargs -n1 sed -i 's!APXS_HTTPD=.*!APXS_HTTPD=${STAGING_BINDIR_NATIVE}/httpd!'
 }
 
 do_configure_append() {
@@ -76,7 +76,7 @@ do_install  () {
     install -m 755 scripts/phpize ${D}${bindir}
     install -m 755 scripts/php-config ${D}${bindir}
     cat aclocal-copy/libtool.m4 aclocal-copy/lt~obsolete.m4 aclocal-copy/ltoptions.m4 \
-        aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > build/libtool.m4
+        aclocal-copy/ltsugar.m4 aclocal-copy/ltversion.m4 > ${S}/build/libtool.m4
 
     oe_runmake install-build install-headers INSTALL_ROOT=${D}
 }