Browse Source

sysklogd: install to /sbin

Install syslogd/klogd to /sbin instead of /usr/sbin to really win over
busybox and avoid the ugly noise when booting without busybox installed.
Also drop uninstall hook and manpage installation.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Gustavo Zacarias 11 years ago
parent
commit
a34cad761b
1 changed files with 2 additions and 16 deletions
  1. 2 16
      package/sysklogd/sysklogd.mk

+ 2 - 16
package/sysklogd/sysklogd.mk

@@ -27,28 +27,14 @@ define SYSKLOGD_BUILD_CMDS
 endef
 endef
 
 
 define SYSKLOGD_INSTALL_TARGET_CMDS
 define SYSKLOGD_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/usr/sbin/syslogd
-	$(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/usr/sbin/klogd
-	$(INSTALL) -D -m 0644 $(@D)/sysklogd.8 $(TARGET_DIR)/usr/share/man/man8/sysklogd.8
-	$(INSTALL) -D -m 0644 $(@D)/syslogd.8 $(TARGET_DIR)/usr/share/man/man8/syslogd.8
-	$(INSTALL) -D -m 0644 $(@D)/syslog.conf.5 $(TARGET_DIR)/usr/share/man/man5/syslog.conf.5
-	$(INSTALL) -D -m 0644 $(@D)/klogd.8 $(TARGET_DIR)/usr/share/man/man8/klogd.8
+	$(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/sbin/syslogd
+	$(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/sbin/klogd
 	if [ ! -f $(TARGET_DIR)/etc/syslog.conf ]; then \
 	if [ ! -f $(TARGET_DIR)/etc/syslog.conf ]; then \
 		$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \
 		$(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \
 			$(TARGET_DIR)/etc/syslog.conf; \
 			$(TARGET_DIR)/etc/syslog.conf; \
 	fi
 	fi
 endef
 endef
 
 
-define SYSKLOGD_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/usr/sbin/syslogd
-	rm -f $(TARGET_DIR)/usr/sbin/klogd
-	rm -f $(TARGET_DIR)/usr/share/man/man8/sysklogd.8
-	rm -f $(TARGET_DIR)/usr/share/man/man8/syslogd.8
-	rm -f $(TARGET_DIR)/usr/share/man/man5/syslog.conf.5
-	rm -f $(TARGET_DIR)/usr/share/man/man8/klogd.8
-	rm -f $(TARGET_DIR)/etc/syslog.conf
-endef
-
 define SYSKLOGD_CLEAN_CMDS
 define SYSKLOGD_CLEAN_CMDS
 	$(MAKE) -C $(@D) clean
 	$(MAKE) -C $(@D) clean
 endef
 endef