aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2003-01-19 12:55:13 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2003-01-19 12:55:13 +0000
commitf2ba45e339a8adc589704217409684f7f6d1d214 (patch)
treee1e28cf3b1f585a6d0d858885fc3e548bb67236c
parent77c60e5c667e1293f92b65056f107c92edcc3965 (diff)
downloadbusybox-w32-f2ba45e339a8adc589704217409684f7f6d1d214.tar.gz
busybox-w32-f2ba45e339a8adc589704217409684f7f6d1d214.tar.bz2
busybox-w32-f2ba45e339a8adc589704217409684f7f6d1d214.zip
Compile option to avoid using /usr directory, patch by Bastian Blank
-rw-r--r--include/applets.h5
-rw-r--r--sysdeps/linux/Config.in11
2 files changed, 16 insertions, 0 deletions
diff --git a/include/applets.h b/include/applets.h
index 0d8f0b4cb..504f86a17 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -41,6 +41,11 @@
41 #define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d}, 41 #define APPLET_ODDNAME(a,b,c,d,e) {a,b,c,d},
42#endif 42#endif
43 43
44#ifdef CONFIG_INSTALL_NO_USR
45#define _BB_DIR_USR_BIN _BB_DIR_BIN
46#define _BB_DIR_USR_SBIN _BB_DIR_SBIN
47#endif
48
44 49
45 50
46#ifdef CONFIG_TEST 51#ifdef CONFIG_TEST
diff --git a/sysdeps/linux/Config.in b/sysdeps/linux/Config.in
index 8648e1489..1e1142e06 100644
--- a/sysdeps/linux/Config.in
+++ b/sysdeps/linux/Config.in
@@ -157,6 +157,17 @@ config EXTRA_CFLAGS_OPTIONS
157 157
158endmenu 158endmenu
159 159
160menu 'Installation Options'
161
162config CONFIG_INSTALL_NO_USR
163 bool "Don't use /usr"
164 default n
165 help
166 Disable use of /usr. Don't activate this option if you don't know,
167 that you really want this behaviour.
168
169endmenu
170
160source archival/Config.in 171source archival/Config.in
161source console-tools/Config.in 172source console-tools/Config.in
162source debianutils/Config.in 173source debianutils/Config.in