diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-02-20 23:13:39 +0000 |
| commit | 2e878658a02ca4651673cad2f41a57f27557d6dc (patch) | |
| tree | fd1c10f972e4e7f79775a2b3c52fe907869e6032 /rules/thttpd.make | |
| parent | be1d99320d214120a306d659e3eacac4411b5ad3 (diff) | |
| download | ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.gz ptxdist-2e878658a02ca4651673cad2f41a57f27557d6dc.tar.xz | |
* init: introduce infrastructure for multiple init methods
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9802 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/thttpd.make')
| -rw-r--r-- | rules/thttpd.make | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/rules/thttpd.make b/rules/thttpd.make index 1070f130c..f23b5fa21 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -60,7 +60,7 @@ $(STATEDIR)/thttpd.install: $(STATEDIR)/thttpd.targetinstall: @$(call targetinfo) - @$(call install_init, thttpd) + @$(call install_init, thttpd) @$(call install_fixup, thttpd,PACKAGE,thttpd) @$(call install_fixup, thttpd,PRIORITY,optional) @$(call install_fixup, thttpd,VERSION,$(THTTPD_VERSION)) @@ -72,22 +72,10 @@ $(STATEDIR)/thttpd.targetinstall: @$(call install_copy, thttpd, 0, 0, 0755, $(THTTPD_DIR)/thttpd, \ /usr/sbin/thttpd) -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) +ifdef PTXCONF_INITMETHOD_BBINIT +ifdef PTXCONF_THTTPD_STARTSCRIPT + @$(call install_alternative, busybox, 0, 0, 0755, /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 - -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)) endif ifdef PTXCONF_THTTPD__GENERIC_SITE |