From Jan Kiszka: This patch fixes the security labelling of the login terminal

[oweals/busybox.git] / Makefile

diff --git a/Makefile b/Makefile
index fe346b0d4eb7c7b1207a4fcfa243217ed2a2b533..da02411bc3154b8c3a5f5d39f32b6c08dcdf9882 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ help:
        @echo '  oldconfig              - resolve any unresolved symbols in .config'
        @echo
        @echo 'Installation:'
-       @echo '  install                - install busybox into $prefix'
+       @echo '  install                - install busybox into $(PREFIX)'
        @echo '  uninstall'
        @echo
        @echo 'Development:'
@@ -144,7 +144,7 @@ include $(top_srcdir)/Rules.mak
 ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
 
 # Default target if none was requested explicitly
-all: defconfig menuconfig
+all: menuconfig
 
 # warn if no configuration exists and we are asked to build a non-config target
 .config:
@@ -205,7 +205,7 @@ allbareconfig: scripts/config/conf
        @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE|BUILD_AT_ONCE)).*/# \1 is not set/" .config
        @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config
        @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config
-       @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
+       @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y)