Compile option to avoid using /usr directory, patch by Bastian Blank

diff --git a/include/applets.h b/include/applets.h
index 0d8f0b4cb4b04b9333000801c76fabf734fcc34e..504f86a17a4e4e7d219abe4a059651dd40be3714 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

diff --git a/sysdeps/linux/Config.in b/sysdeps/linux/Config.in
index 8648e1489434f7f1726efda17c07e8e6939f73e6..1e1142e068c752dec1949643967c4057b589a226 100644 (file)
--- a/sysdeps/linux/Config.in
+++ b/sysdeps/linux/Config.in
@@ -157,6 +157,17 @@ config EXTRA_CFLAGS_OPTIONS
 
 endmenu
 
+menu 'Installation Options'
+
+config CONFIG_INSTALL_NO_USR
+       bool "Don't use /usr"
+       default n
+       help
+         Disable use of /usr. Don't activate this option if you don't know,
+         that you really want this behaviour.
+
+endmenu
+
 source archival/Config.in
 source console-tools/Config.in
 source debianutils/Config.in