summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2015-06-19 11:07:21 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2015-06-19 11:58:04 +0200
commit26b3caaca3a798ebd3adf778de39d0adc9ab3e6e (patch)
treeafea75421a0897f80e740a285a89fa50e635b520
parent68682e38770ad1a3d3e61322b1e593f382b32bff (diff)
downloadptxdist-26b3caaca3a798ebd3adf778de39d0adc9ab3e6e.tar.gz
ptxdist-26b3caaca3a798ebd3adf778de39d0adc9ab3e6e.tar.xz
lighttpd: fix migration from generic -> projectroot
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--rules/lighttpd.in2
-rw-r--r--rules/lighttpd.make8
2 files changed, 5 insertions, 5 deletions
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index aac0756ba..d53539408 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -236,7 +236,7 @@ config LIGHTTPD_GENERIC_SITE
prompt "Populate a generic website"
help
This install a generic website into /var/www/index.html
- from <ptxdist-install>/generic/var/www/lighttpd.html
+ from <ptxdist-install>/projectroot/var/www/lighttpd.html
and some php demos.
endif
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 248dd3f66..6fd6fff6d 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -145,19 +145,19 @@ endif
ifdef PTXCONF_LIGHTTPD_GENERIC_SITE
ifdef PTXCONF_LIGHTTPD_MOD_FASTCGI_PHP
@$(call install_copy, lighttpd, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/generic/var/www/lighttpd.html, \
+ $(PTXDIST_TOPDIR)/projectroot/var/www/lighttpd.html, \
/var/www/index.html)
@$(call install_copy, lighttpd, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/generic/var/www/bottles.php, \
+ $(PTXDIST_TOPDIR)/projectroot/var/www/bottles.php, \
/var/www/bottles.php)
@$(call install_copy, lighttpd, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/generic/var/www/more_bottles.php, \
+ $(PTXDIST_TOPDIR)/projectroot/var/www/more_bottles.php, \
/var/www/more_bottles.php)
else
@$(call install_copy, lighttpd, 12, 102, 0644, \
- $(PTXDIST_TOPDIR)/generic/var/www/httpd.html, \
+ $(PTXDIST_TOPDIR)/projectroot/var/www/httpd.html, \
/var/www/index.html)
endif
endif