summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2009-05-28 14:43:18 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2009-05-28 14:43:18 +0000
commite279ed12fd93810812efcc44e66aac569e493b52 (patch)
treec5d09ca542c8b222bda2231c03b110bc71b00e20 /rules
parent845f1da6f7a87ff63d0d5c6f6b63c2a9739ea5fa (diff)
downloadptxdist-e279ed12fd93810812efcc44e66aac569e493b52.tar.gz
ptxdist-e279ed12fd93810812efcc44e66aac569e493b52.tar.xz
[php5] fix mod_php
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10600 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
-rw-r--r--rules/php5.in2
-rw-r--r--rules/php5.make3
2 files changed, 3 insertions, 2 deletions
diff --git a/rules/php5.in b/rules/php5.in
index 6861ad49e..45415b356 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -52,8 +52,6 @@ config PHP5_SAPI_APXS2FILTER
config PHP5_SAPI_APXS2
bool
- # with apache support, 'make install' breaks
- depends on BROKEN
prompt "apache mod_php (apxs2)"
help
Build shared Apache 2.0 Handler module.
diff --git a/rules/php5.make b/rules/php5.make
index 6b2b53477..ef3b7de93 100644
--- a/rules/php5.make
+++ b/rules/php5.make
@@ -273,6 +273,9 @@ endif
$(STATEDIR)/php5.install:
@$(call targetinfo)
+ifdef PTXCONF_PHP5_SAPI_APXS2
+ cp "$(SYSROOT)/etc/httpd.conf" "$(PHP5_PKGDIR)/etc"
+endif
cd $(PHP5_DIR) && \
$(PHP5_PATH) \
make install \