diff options
| author | Joachim Nilsson <troglobit@vmlinux.org> | 2010-12-05 23:05:38 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-12-05 23:05:38 +0100 |
| commit | dc160039ad4218c954afc1236e77f8a3127ca9df (patch) | |
| tree | 47bac653b761b1a2fb86efef46b6f29e18973a21 | |
| parent | 2161bd701a9267c04aa68fb43b2d40d7793884d4 (diff) | |
| download | busybox-dc160039ad4218c954afc1236e77f8a3127ca9df.tar.gz | |
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>
| -rw-r--r-- | include/applets.src.h | 5 |
1 files changed, 5 insertions, 0 deletions
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)) |