[oe-commits] Paul Eggleton : modphp: fix re-exec of do_install

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Fri May 10 16:22:17 2013 +0100

modphp: fix re-exec of do_install

Copying files and then modifying them is preferred rather than the other
way around because then the modification can never be run twice if the
function is re-executed on an existing work directory.

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

---

 meta-webserver/recipes-php/modphp/modphp5.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc
index 62b59a1..192abd7 100644
--- a/meta-webserver/recipes-php/modphp/modphp5.inc
+++ b/meta-webserver/recipes-php/modphp/modphp5.inc
@@ -65,8 +65,8 @@ do_install  () {
     install -d ${D}${sysconfdir}/apache2/modules.d
     install -d ${D}${sysconfdir}/php/apache2-php5
     install -m 755  libs/libphp5.so ${D}${libdir}/apache2/modules
-    sed -i s,lib/,${libdir}/, ${WORKDIR}/70_mod_php5.conf
     install -m 644  ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d
+    sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php5.conf
     cat ${S}/php.ini-production | \
         sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \
         > ${D}${sysconfdir}/php/apache2-php5/php.ini