summaryrefslogtreecommitdiffstats
path: root/rules/apache2.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2008-11-10 17:01:14 +0000
committerRobert Schwebel <r.schwebel@pengutronix.de>2008-11-10 17:01:14 +0000
commit8c6520e03aa571201a920ffb1158cbf9be431aac (patch)
tree2645aac9cc8500e62eb825ae78c23a65ba2634ea /rules/apache2.make
parenta297c9bff033e419b2464d736b8fcead8682759d (diff)
downloadptxdist-8c6520e03aa571201a920ffb1158cbf9be431aac.tar.gz
ptxdist-8c6520e03aa571201a920ffb1158cbf9be431aac.tar.xz
* apache2: put httpd.conf into right directory, according to configuration
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9103 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
-rw-r--r--rules/apache2.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/apache2.make b/rules/apache2.make
index 3f73255f8..4dd717b85 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -235,7 +235,7 @@ endif
ifdef PTXCONF_APACHE2_USERCONFIG
# users one
@$(call install_copy, apache2, 12, 102, 0644, \
- $(PTXDIST_WORKSPACE)/projectroot/httpd.conf, \
+ $(PTXDIST_WORKSPACE)/projectroot/$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, n)
endif
# modify placeholders with data from configuration