From: Peter Korsgaard Date: Tue, 3 Apr 2012 20:51:05 +0000 (+0200) Subject: tinyhttpd: fix initscript, install as /usr/sbin/tinyhttpd X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d58777fdf0d18da7c08f6b604d36f85aae2ec5bb;p=buildroot.git tinyhttpd: fix initscript, install as /usr/sbin/tinyhttpd The init script was expecting the binary to be called tinyhttpd, but httpd was used. Fix it to install as tinyhttpd as httpd will conflict with other web servers (E.G. the busybox one). Signed-off-by: Peter Korsgaard --- diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index 6bc37d46e3..9b06589d3c 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -12,14 +12,14 @@ define TINYHTTPD_BUILD_CMDS endef define TINYHTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/httpd + $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd $(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \ $(TARGET_DIR)/etc/init.d/S85tinyhttpd mkdir -p $(TARGET_DIR)/var/www endef define TINYHTTPD_CLEAN_CMDS - rm -f $(TARGET_DIR)/usr/sbin/httpd + rm -f $(TARGET_DIR)/usr/sbin/tinyhttpd rm -f $(TARGET_DIR)/etc/init.d/S85tinyhttpd endef