diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2013-04-01 10:33:37 +0800 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-04-03 18:07:50 +0100 |
commit | 8bfd395b06fdf68919b271089dde198213bbe54c (patch) | |
tree | 3bd3a570a97b616813dc3432e50dd3e109765fd4 /meta-webserver/recipes-php | |
parent | af6c39379dbe6822d1457498e53747ed63bdbb65 (diff) | |
download | meta-openembedded-8bfd395b06fdf68919b271089dde198213bbe54c.tar.gz |
modphp: use libdir instead of baselib to load module
When we change the apache2 files layout to debian style,
the ServerRoot in httpd.conf was changed to "/" from "/usr",
then the relative path to libphp5 module in 70_mod_php5.conf
will be invalid so it fails to load the module, use libdir
(absolute path) instead so it will always find the module.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Diffstat (limited to 'meta-webserver/recipes-php')
-rw-r--r-- | 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 c359ff9e9..33dbe8937 100644 --- a/meta-webserver/recipes-php/modphp/modphp5.inc +++ b/meta-webserver/recipes-php/modphp/modphp5.inc | |||
@@ -67,7 +67,7 @@ do_install () { | |||
67 | install -d ${D}${sysconfdir}/apache2/modules.d | 67 | install -d ${D}${sysconfdir}/apache2/modules.d |
68 | install -d ${D}${sysconfdir}/php/apache2-php5 | 68 | install -d ${D}${sysconfdir}/php/apache2-php5 |
69 | install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules | 69 | install -m 755 libs/libphp5.so ${D}${libdir}/apache2/modules |
70 | sed -i s,lib/,${baselib}/, ${WORKDIR}/70_mod_php5.conf | 70 | sed -i s,lib/,${libdir}/, ${WORKDIR}/70_mod_php5.conf |
71 | install -m 644 ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d | 71 | install -m 644 ${WORKDIR}/70_mod_php5.conf ${D}${sysconfdir}/apache2/modules.d |
72 | cat ${S}/php.ini-production | \ | 72 | cat ${S}/php.ini-production | \ |
73 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ | 73 | sed -e 's,extension_dir = \"\./\",extension_dir = \"/usr/lib/extensions\",' \ |