* to be diskussed:

	 - collects relevant information into one menu
	 - conflicts currently with rootfs.in until discussed!
	 - in rootfs.in only the link to the startscript should be
	   configurable
	 - should be also done with udev
	 - should shrinks rootfs.in and its huge menu


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6268 33e552b5-05e3-0310-8538-816dae2090ed

2 files changed, 74 insertions, 16 deletions

diff --git a/rules/thttpd.in b/rules/thttpd.in
index 4283ebdde..bd2e7f2a3 100644
--- a/rules/thttpd.in
+++ b/rules/thttpd.in
@@ -1,13 +1,56 @@
-config THTTPD
+menuconfig THTTPD
 	bool
 	prompt "thttpd              "
 	help
-	  thttpd (thin httpd) is a small, fast secure webserver. 
-	  
-	  It features CGI support, URL-traffic-based throttling 
-	  and basic authentication. thttpd has a very small memory 
-	  footprint as it only forks itself in order to execute 
-	  CGI scripts. It is designed to be as fast as fully 
-	  featured web-servers and it performs extremely well 
+	  thttpd (thin httpd) is a small, fast secure webserver.
+
+	  It features CGI support, URL-traffic-based throttling
+	  and basic authentication. thttpd has a very small memory
+	  footprint as it only forks itself in order to execute
+	  CGI scripts. It is designed to be as fast as fully
+	  featured web-servers and it performs extremely well
 	  under high load.
 
+	comment "thttpd runtime options  ---"
+	depends on THTTPD
+
+	config ROOTFS_ETC_INITD_THTTPD
+		depends on THTTPD
+		bool
+		default y
+		prompt "Install startup script      "
+		help
+		  The /etc/init.d/thttpd script lets you control the udevd daemon.
+
+		choice
+			prompt "Kind of startup script"
+			depends on ROOTFS_ETC_INITD_THTTPD
+			default THTTPD_ETC_INITD_GENERIC
+
+			config THTTPD_ETC_INITD_GENERIC
+				bool
+				prompt "Use generic thttpd script"
+				help
+				  Installs a generic /etc/init.d/thttpd startup
+				  script. The file from
+				  <ptxdist-install>/generic/etc/init.d/thttpd
+				  will be used.
+
+			config THTTPD_ETC_INITD_USER
+				bool
+				prompt "User defined"
+				help
+				  This uses a user defined thttpd. PTXdist uses
+				  file projectroot/etc/init.d/thttpd in your
+				  local project
+
+		endchoice
+
+	config THTTPD_GENERIC_SITE
+		depends on THTTPD
+		bool
+		default y
+		prompt "Populate a generic website"
+		help
+		  This install a generic website into /var/www/index.html
+
diff --git a/rules/thttpd.make b/rules/thttpd.make
index a2097e7d7..8348d0254 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -2,7 +2,7 @@
 # $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
-#          
+#
 # See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
@@ -113,20 +113,35 @@ $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps_default)
 	@$(call install_fixup, thttpd,DEPENDS,)
 	@$(call install_fixup, thttpd,DESCRIPTION,missing)
 
-	@$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, /usr/sbin/thttpd)
+	@$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, \
+		/usr/sbin/thttpd)
 ifdef PTXCONF_ROOTFS_ETC_INITD_THTTPD
-ifneq ($(call remove_quotes,$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE)),)
-	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXCONF_ROOTFS_ETC_INITD_THTTPD_USER_FILE), /etc/init.d/thttpd, n)
-else
-	@$(call install_copy, thttpd, 0, 0, 0755, $(PTXDIST_TOPDIR)/generic/etc/init.d/thttpd, /etc/init.d/thttpd, n)
+ifdef PTXCONF_THTTPD_ETC_INITD_GENERIC
+	@$(call install_copy, thttpd, 0, 0, 0755, \
+		$(PTXDIST_TOPDIR)/generic/etc/init.d/thttpd, \
+		/etc/init.d/thttpd, n)
+endif
+ifdef PTXCONF_THTTPD_ETC_INITD_USER
+	@$(call install_copy, thttpd, 0, 0, 0755, \
+		${PTXDIST_WORKSPACE}/projectroot/etc/init.d/thttpd, \
+		/etc/init.d/thttpd, n)
 endif
 endif
+#
+# FIXME: Is this packet the right location for the link?
+#
 ifneq ($(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK),"")
 	@$(call install_copy, thttpd, 0, 0, 0755, /etc/rc.d)
-	@$(call install_link, thttpd, ../init.d/thttpd, /etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
+	@$(call install_link, thttpd, ../init.d/thttpd, \
+		/etc/rc.d/$(PTXCONF_ROOTFS_ETC_INITD_THTTPD_LINK))
 endif
+
+ifdef PTXCONF_THTTPD_GENERIC_SITE
 	@$(call install_copy, thttpd, 12, 102, 0755, /var/www)
-	@$(call install_copy, thttpd, 12, 102, 0644, $(PTXDIST_TOPDIR)/generic/thttpd.html, /var/www/index.html, n)
+	@$(call install_copy, thttpd, 12, 102, 0644, \
+		$(PTXDIST_TOPDIR)/generic/thttpd.html, \
+		/var/www/index.html, n)
+endif
 
 	@$(call install_finish, thttpd)
 	@$(call touch, $@)