Patchwork [5/7] modphp: fix re-exec of do_install

login
register
mail settings
Submitter Paul Eggleton
Date May 10, 2013, 6:09 p.m.
Message ID <0f7c89e633df092a88578966f3e44008b3b2be35.1368209302.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/49761/
State Accepted, archived
Commit e1e316edeec9c0e9ad12cc0f0d3d73d4d699bef3
Headers show

Comments

Paul Eggleton - May 10, 2013, 6:09 p.m.
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@linux.intel.com>
---
 meta-webserver/recipes-php/modphp/modphp5.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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