udhcpc is supposed to be in /sbin, not /usr/sbin/

[oweals/busybox.git] / include / applets.h

diff --git a/include/applets.h b/include/applets.h
index 9e95b2e9dd87938df1ee3b0f3d4d5ee5b48c3231..6c274825caa3cec00727c465f8ca6436251ae9c5 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -41,6 +41,11 @@
   #define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d},
 #endif
 
+#ifdef CONFIG_INSTALL_NO_USR
+#define _BB_DIR_USR_BIN _BB_DIR_BIN
+#define _BB_DIR_USR_SBIN _BB_DIR_SBIN
+#endif
+
 
 
 #ifdef CONFIG_TEST
@@ -260,6 +265,9 @@
 #ifdef CONFIG_IFUPDOWN
        APPLET(ifup, ifupdown_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_INETD
+       APPLET(inetd, inetd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_INIT
        APPLET(init, init_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
@@ -267,22 +275,22 @@
        APPLET(insmod, insmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IP
-       APPLET(ip, ip_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+       APPLET(ip, ip_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPCALC
        APPLET(ipcalc, ipcalc_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPADDRESS
-       APPLET(ipaddr, ipaddr_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+       APPLET(ipaddr, ipaddr_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPLINK
-       APPLET(iplink, iplink_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+       APPLET(iplink, iplink_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPROUTE
-       APPLET(iproute, iproute_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+       APPLET(iproute, iproute_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_IPTUNNEL
-       APPLET(iptunnel, iptunnel_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+       APPLET(iptunnel, iptunnel_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_KILL
        APPLET(kill, kill_main, _BB_DIR_BIN, _BB_SUID_NEVER)
@@ -555,7 +563,7 @@
        APPLET(tty, tty_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_UDHCPC
-       APPLET(udhcpc, udhcpc_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
+       APPLET(udhcpc, udhcpc_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_UDHCPD
         APPLET(udhcpd, udhcpd_main, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)
@@ -593,6 +601,9 @@
 #ifdef CONFIG_UUENCODE
        APPLET(uuencode, uuencode_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_VCONFIG
+       APPLET(vconfig, vconfig_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_VI
        APPLET(vi, vi_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif