From aafe1ece67b9da440104fdc207efbbf21dcc6e50 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 4 Jul 2008 08:46:40 +0000
Subject: 	* generic/index.html, generic/var/www/index.html, 
 generic/httpd.conf, generic/etc/apache2/httpd.conf 	moved

	* rules/apache2.in, rules/apache2.make:
	adoped accordingly

	* generic/thttpd.html, generic/var/www/thttpd.html:
	moved

	* rules/thttpd.in, rules/apache2.make:
	adoped accordingly


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8581 33e552b5-05e3-0310-8538-816dae2090ed
---
 rules/apache2.make | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'rules/apache2.make')

diff --git a/rules/apache2.make b/rules/apache2.make
index 4ae2f7374..3f73255f8 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -215,7 +215,7 @@ ifneq ($(PTXCONF_APACHE2_DOCUMENTROOT),"")
 	@$(call install_copy, apache2, 12, 102, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
 ifdef PTXCONF_APACHE2_DEFAULT_INDEX
 	@$(call install_copy, apache2, 12, 102, 0644, \
-		$(PTXDIST_TOPDIR)/generic/index.html, \
+		$(PTXDIST_TOPDIR)/generic/var/www/index.html, \
 		$(PTXCONF_APACHE2_DOCUMENTROOT)/index.html, n)
 endif
 endif
@@ -229,7 +229,7 @@ ifdef PTXCONF_APACHE2_INSTALL_CONFIG
 ifdef PTXCONF_APACHE2_DEFAULTCONFIG
 # use generic one
 	@$(call install_copy, apache2, 12, 102, 0644, \
-		$(PTXDIST_TOPDIR)/generic/httpd.conf, \
+		$(PTXDIST_TOPDIR)/generic/etc/apache2/httpd.conf, \
 		$(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, n)
 endif
 ifdef PTXCONF_APACHE2_USERCONFIG
@@ -294,22 +294,6 @@ ifneq ($(PTXCONF_ROOTFS_ETC_INITD_HTTPD_LINK),"")
 endif
 endif
 
-# #
-# # create apache's default serverroot
-# #
-# ifneq ($(PTXCONF_ROOTFS_HTTPD_SERVERROOT),"")
-# ifdef PTXCONF_ROOTFS_HTTPD_USER_DOC
-# 	@cd $(PTXCONF_ROOTFS_HTTPD_USER_DOC_PATH); \
-# 	for i in *.html *.gif *.png; do \
-# 		$(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/$$i, n); \
-# 	done
-# else
-# 	$(call install_copy, apache2, 12,102,0644,$(PTXDIST_TOPDIR)/projetcs-example/generic/index.html,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/index.html, n)
-# endif
-# 	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin)
-# 	@$(call install_copy, apache2, 12,102,0644,$(APACHE2_DIR)/doc/cgi-examples/test-cgi,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/cgi-bin, n)
-# 	@$(call install_copy, apache2, 12,102,0755,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/log)
-
 	@$(call install_finish, apache2)
 
 	@$(call touch)
-- 
cgit v1.2.3