summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenys Vlasenko2010-10-12 04:18:05 +0200
committerDenys Vlasenko2010-10-12 04:18:05 +0200
commitd4d289acf5eb59ebae414f9aae8a74de30dce36a (patch)
tree7a7c261ce263eeb15d152a904936d55c41858b5e /include
parentb1993380ba4a89062a08b2b6c579158aa667759e (diff)
downloadbusybox-d4d289acf5eb59ebae414f9aae8a74de30dce36a.zip
busybox-d4d289acf5eb59ebae414f9aae8a74de30dce36a.tar.gz
tweaks to build system, mainly making menuconfig text and order clearer
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/applets.src.h5
-rw-r--r--include/busybox.h7
2 files changed, 6 insertions, 6 deletions
diff --git a/include/applets.src.h b/include/applets.src.h
index d2b1d19..6a14a65 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -56,11 +56,6 @@ s - suid type:
# define APPLET_NOFORK(name,main,l,s,name2) { #name, #main, l, s, 1, 1 },
#endif
-#if ENABLE_INSTALL_NO_USR
-# define _BB_DIR_USR_BIN _BB_DIR_BIN
-# define _BB_DIR_USR_SBIN _BB_DIR_SBIN
-#endif
-
INSERT
IF_TEST(APPLET_NOFORK([, test, _BB_DIR_USR_BIN, _BB_SUID_DROP, test))
diff --git a/include/busybox.h b/include/busybox.h
index 76415dd..757317f 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -16,8 +16,13 @@ typedef enum bb_install_loc_t {
_BB_DIR_ROOT = 0,
_BB_DIR_BIN,
_BB_DIR_SBIN,
+#if ENABLE_INSTALL_NO_USR
+ _BB_DIR_USR_BIN = _BB_DIR_BIN,
+ _BB_DIR_USR_SBIN = _BB_DIR_SBIN,
+#else
_BB_DIR_USR_BIN,
- _BB_DIR_USR_SBIN
+ _BB_DIR_USR_SBIN,
+#endif
} bb_install_loc_t;
typedef enum bb_suid_t {