diff options
| author | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-02 15:07:39 +0000 |
|---|---|---|
| committer | Juergen Beisert <j.beisert@pengutronix.de> | 2006-11-02 15:07:39 +0000 |
| commit | 51de6017692c238588a5c9343f0fe7b2a8037e2e (patch) | |
| tree | aec7af65fa91e21511dba7b4d2751ea5d02dbf07 /rules/thttpd.make | |
| parent | e0a7ee556609b0e76d5fe4b06e53ba21d13798b3 (diff) | |
| download | ptxdist-51de6017692c238588a5c9343f0fe7b2a8037e2e.tar.gz ptxdist-51de6017692c238588a5c9343f0fe7b2a8037e2e.tar.xz | |
* 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
Diffstat (limited to 'rules/thttpd.make')
| -rw-r--r-- | rules/thttpd.make | 31 |
1 files changed, 23 insertions, 8 deletions
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, $@) |