summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/php/php.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-devtools/php/php.inc b/meta-oe/recipes-devtools/php/php.inc
index f882e32319..d3ec9ded38 100644
--- a/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-oe/recipes-devtools/php/php.inc
@@ -135,9 +135,9 @@ do_install_prepend_class-target() {
135 135
136# fixme 136# fixme
137do_install_append_class-target() { 137do_install_append_class-target() {
138 install -d ${D}/${sysconfdir}/ 138 install -d ${D}${sysconfdir}/
139 if [ -d ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ];then 139 if [ -d ${RECIPE_SYSROOT_NATIVE}${sysconfdir} ];then
140 mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir}/* ${D}/${sysconfdir}/ 140 install -m 0644 ${RECIPE_SYSROOT_NATIVE}${sysconfdir}/pear.conf ${D}${sysconfdir}/
141 fi 141 fi
142 rm -rf ${D}/${TMPDIR} 142 rm -rf ${D}/${TMPDIR}
143 rm -rf ${D}/.registry 143 rm -rf ${D}/.registry
@@ -145,7 +145,7 @@ do_install_append_class-target() {
145 rm -rf ${D}/.[a-z]* 145 rm -rf ${D}/.[a-z]*
146 rm -rf ${D}/var 146 rm -rf ${D}/var
147 rm -f ${D}/${sysconfdir}/php-fpm.conf.default 147 rm -f ${D}/${sysconfdir}/php-fpm.conf.default
148 sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf 148 sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}${sysconfdir}/pear.conf
149 install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf 149 install -m 0644 ${WORKDIR}/php-fpm.conf ${D}/${sysconfdir}/php-fpm.conf
150 install -d ${D}/${sysconfdir}/apache2/conf.d 150 install -d ${D}/${sysconfdir}/apache2/conf.d
151 install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf 151 install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf