From e1e316edeec9c0e9ad12cc0f0d3d73d4d699bef3 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 10 May 2013 16:22:17 +0100 Subject: 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 --- meta-webserver/recipes-php/modphp/modphp5.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-php/modphp/modphp5.inc b/meta-webserver/recipes-php/modphp/modphp5.inc index 62b59a1c78..192abd799c 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 -- cgit 1.2.3-korg