From: Joachim Nilsson <troglobit@vmlinux.org>
Date: Sun, 5 Dec 2010 22:05:38 +0000 (+0100)
Subject: build system: fix "make install" to skip /usr when configured so
X-Git-Tag: 1_19_0~468
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc160039ad4218c954afc1236e77f8a3127ca9df;p=oweals%2Fbusybox.git

build system: fix "make install" to skip /usr when configured so

Fix regression in BusyBox 1.18.0 where the NO_USR config option no longer
bites for "make install".  The busybox.mkll script stumbles without these
lines and as a result *always* creates /usr/ symlinks.

Signed-off-by: Joachim Nilsson <troglobit@vmlinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/include/applets.src.h b/include/applets.src.h
index 9dd5b6d84..5058feb3a 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -56,6 +56,11 @@ 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))