ash: rename some function parameters to match dash

[oweals/busybox.git] / Makefile.custom

diff --git a/Makefile.custom b/Makefile.custom
index 3561e57687ca32bf9d6019db4c273d8f950bf3be..6f679c4e12b4cb7bc139104aa321f035db387261 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -11,6 +11,9 @@ busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autocon
        $(Q)-SUID="DROP" $(SHELL) $^ > $@
 
 .PHONY: install
+ifeq ($(CONFIG_INSTALL_APPLET_DONT),y)
+INSTALL_OPTS:= --none
+endif
 ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
 INSTALL_OPTS:= --symlinks
 endif
@@ -28,6 +31,10 @@ ifeq ($(CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER),y)
 INSTALL_OPTS:= --scriptwrapper
 endif
 endif
+ifeq ($(CONFIG_FEATURE_INDIVIDUAL),y)
+INSTALL_OPTS:= --binaries
+LIBBUSYBOX_SONAME:= 0_lib/libbusybox.so.$(BB_VER)
+endif
 install: $(srctree)/applets/install.sh busybox busybox.links
        $(Q)DO_INSTALL_LIBS="$(strip $(LIBBUSYBOX_SONAME) $(DO_INSTALL_LIBS))" \
                $(SHELL) $< $(CONFIG_PREFIX) $(INSTALL_OPTS)
@@ -42,6 +49,9 @@ ifeq ($(strip $(CONFIG_FEATURE_SUID)),y)
        @echo
 endif
 
+install-noclobber: INSTALL_OPTS+=--noclobber
+install-noclobber: install
+
 uninstall: busybox.links
        rm -f $(CONFIG_PREFIX)/bin/busybox
        for i in `cat busybox.links` ; do rm -f $(CONFIG_PREFIX)$$i; done
@@ -55,7 +65,11 @@ endif
 # (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
 .PHONY: check
 .PHONY: test
+ifeq ($(CONFIG_UNIT_TEST),y)
+UNIT_CMD = ./busybox unit
+endif
 check test: busybox busybox.links
+       $(UNIT_CMD)
        test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
        bindir=$(objtree) srcdir=$(srctree)/testsuite \
        $(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
@@ -73,6 +87,10 @@ release: distclean
                -name .git \
                -print \
                -exec rm -r -f {} \; ; \
+       find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
+               -name .gitignore \
+               -print \
+               -exec rm -f {} \; ; \
        find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
                -name .\#* \
                -print \