diff options
| -rw-r--r-- | meta-oe/recipes-devtools/php/php.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc index 4c0617c49c..d738d2d93f 100644 --- a/meta-oe/recipes-devtools/php/php.inc +++ b/meta-oe/recipes-devtools/php/php.inc | |||
| @@ -172,10 +172,8 @@ do_install_append_class-target() { | |||
| 172 | done | 172 | done |
| 173 | 173 | ||
| 174 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then | 174 | if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then |
| 175 | install -d ${D}${libdir}/apache2/modules | ||
| 176 | install -d ${D}${sysconfdir}/apache2/modules.d | 175 | install -d ${D}${sysconfdir}/apache2/modules.d |
| 177 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} | 176 | install -d ${D}${sysconfdir}/php/apache2-php${PHP_MAJOR_VERSION} |
| 178 | install -m 755 libs/libphp${PHP_MAJOR_VERSION}.so ${D}${libdir}/apache2/modules | ||
| 179 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d | 177 | install -m 644 ${WORKDIR}/70_mod_php${PHP_MAJOR_VERSION}.conf ${D}${sysconfdir}/apache2/modules.d |
| 180 | sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf | 178 | sed -i s,lib/,${libdir}/, ${D}${sysconfdir}/apache2/modules.d/70_mod_php${PHP_MAJOR_VERSION}.conf |
| 181 | cat ${S}/php.ini-production | \ | 179 | cat ${S}/php.ini-production | \ |
| @@ -211,7 +209,7 @@ INITSCRIPT_PACKAGES = "${PN}-fpm" | |||
| 211 | inherit update-rc.d | 209 | inherit update-rc.d |
| 212 | 210 | ||
| 213 | FILES_${PN}-dbg =+ "${bindir}/.debug \ | 211 | FILES_${PN}-dbg =+ "${bindir}/.debug \ |
| 214 | ${libdir}/apache2/modules/.debug" | 212 | ${libexecdir}/apache2/modules/.debug" |
| 215 | FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" | 213 | FILES_${PN}-doc += "${PHP_LIBDIR}/php/doc" |
| 216 | FILES_${PN}-cli = "${bindir}/php" | 214 | FILES_${PN}-cli = "${bindir}/php" |
| 217 | FILES_${PN}-phar = "${bindir}/phar*" | 215 | FILES_${PN}-phar = "${bindir}/phar*" |
| @@ -237,7 +235,7 @@ FILES_${PN}-dev = "${includedir}/php ${PHP_LIBDIR}/build ${bindir}/phpize \ | |||
| 237 | FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" | 235 | FILES_${PN}-staticdev += "${PHP_LIBDIR}/extensions/*/*.a" |
| 238 | FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" | 236 | FILES_${PN}-opcache = "${PHP_LIBDIR}/extensions/*/opcache${SOLIBSDEV}" |
| 239 | FILES_${PN} = "${PHP_LIBDIR}/php" | 237 | FILES_${PN} = "${PHP_LIBDIR}/php" |
| 240 | FILES_${PN} += "${bindir}" | 238 | FILES_${PN} += "${bindir} ${libexecdir}/apache2" |
| 241 | 239 | ||
| 242 | SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" | 240 | SUMMARY_${PN}-modphp = "PHP module for the Apache HTTP server" |
| 243 | FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" | 241 | FILES_${PN}-modphp = "${libdir}/apache2 ${sysconfdir}" |
