diff options
-rw-r--r-- | Makefile.custom | 3 | ||||
-rwxr-xr-x | applets/install.sh | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.custom b/Makefile.custom index 28d0ef7bc..6f679c4e1 100644 --- a/Makefile.custom +++ b/Makefile.custom | |||
@@ -11,6 +11,9 @@ busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autocon | |||
11 | $(Q)-SUID="DROP" $(SHELL) $^ > $@ | 11 | $(Q)-SUID="DROP" $(SHELL) $^ > $@ |
12 | 12 | ||
13 | .PHONY: install | 13 | .PHONY: install |
14 | ifeq ($(CONFIG_INSTALL_APPLET_DONT),y) | ||
15 | INSTALL_OPTS:= --none | ||
16 | endif | ||
14 | ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y) | 17 | ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y) |
15 | INSTALL_OPTS:= --symlinks | 18 | INSTALL_OPTS:= --symlinks |
16 | endif | 19 | endif |
diff --git a/applets/install.sh b/applets/install.sh index c75a78e9d..9aede0f53 100755 --- a/applets/install.sh +++ b/applets/install.sh | |||
@@ -5,7 +5,9 @@ export LC_CTYPE=POSIX | |||
5 | 5 | ||
6 | prefix=$1 | 6 | prefix=$1 |
7 | if [ -z "$prefix" ]; then | 7 | if [ -z "$prefix" ]; then |
8 | echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]" | 8 | echo "usage: applets/install.sh DESTINATION TYPE [OPTS ...]" |
9 | echo " TYPE is one of: --symlinks --hardlinks --binaries --scriptwrapper --none" | ||
10 | echo " OPTS is one or more of: --cleanup --noclobber" | ||
9 | exit 1 | 11 | exit 1 |
10 | fi | 12 | fi |
11 | shift # Keep only remaining options | 13 | shift # Keep only remaining options |
@@ -32,7 +34,7 @@ while [ ${#} -gt 0 ]; do | |||
32 | --sw-sh-sym) scriptwrapper="y"; linkopts="-fs";; | 34 | --sw-sh-sym) scriptwrapper="y"; linkopts="-fs";; |
33 | --cleanup) cleanup="1";; | 35 | --cleanup) cleanup="1";; |
34 | --noclobber) noclobber="1";; | 36 | --noclobber) noclobber="1";; |
35 | "") h="";; | 37 | --none) h="";; |
36 | *) echo "Unknown install option: $1"; exit 1;; | 38 | *) echo "Unknown install option: $1"; exit 1;; |
37 | esac | 39 | esac |
38 | shift | 40 | shift |