emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Joachim Nilsson 2010-12-05 23:05:38 +01:00 committed by Denys Vlasenko
parent 2161bd701a
commit dc160039ad
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/applets.src.h
View File

@ -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))