aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 18:33:34 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-05-19 18:33:34 +0000
commit351c832d754d0ae10be4217d732ba857d2ce5713 (patch)
treeeee0d81390c75d81338c29598d40feadb82b864b
parenta254065e636c4c9bbf13cd0150f38d90ade2fbb0 (diff)
downloadbusybox-w32-351c832d754d0ae10be4217d732ba857d2ce5713.tar.gz
busybox-w32-351c832d754d0ae10be4217d732ba857d2ce5713.tar.bz2
busybox-w32-351c832d754d0ae10be4217d732ba857d2ce5713.zip
- redirect stdout of scripts/config/conf to /nil for
allyesconfig, allnoconfig, defconfig, allbareconfig - fix invalid call to "make"; use $(MAKE) instead.
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 7bf72f232..778bf2937 100644
--- a/Makefile
+++ b/Makefile
@@ -173,7 +173,7 @@ scripts/config/mconf: scripts/config/Makefile
173 fi 173 fi
174 174
175menuconfig: scripts/config/mconf 175menuconfig: scripts/config/mconf
176 @[ -f .config ] || make $(MAKEFLAGS) defconfig 176 @[ -f .config ] || $(MAKE) $(MAKEFLAGS) defconfig
177 @./scripts/config/mconf $(CONFIG_CONFIG_IN) 177 @./scripts/config/mconf $(CONFIG_CONFIG_IN)
178 178
179config: scripts/config/conf 179config: scripts/config/conf
@@ -186,29 +186,29 @@ randconfig: scripts/config/conf
186 @./scripts/config/conf -r $(CONFIG_CONFIG_IN) 186 @./scripts/config/conf -r $(CONFIG_CONFIG_IN)
187 187
188allyesconfig: scripts/config/conf 188allyesconfig: scripts/config/conf
189 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) 189 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
190 @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .config 190 @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .config
191 @./scripts/config/conf -o $(CONFIG_CONFIG_IN) 191 @./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
192 192
193allnoconfig: scripts/config/conf 193allnoconfig: scripts/config/conf
194 @./scripts/config/conf -n $(CONFIG_CONFIG_IN) 194 @./scripts/config/conf -n $(CONFIG_CONFIG_IN) > /dev/null
195 195
196# defconfig is allyesconfig minus any features that are specialized enough 196# defconfig is allyesconfig minus any features that are specialized enough
197# or cause enough behavior change that the user really should switch them on 197# or cause enough behavior change that the user really should switch them on
198# manually if that's what they want. Sort of "maximum sane config". 198# manually if that's what they want. Sort of "maximum sane config".
199 199
200defconfig: scripts/config/conf 200defconfig: scripts/config/conf
201 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) 201 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
202 @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config 202 @$(SED) -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|BUILD_(AT_ONCE|LIBBUSYBOX)|FEATURE_(DEVFS|FULL_LIBBUSYBOX|SHARED_BUSYBOX|MTAB_SUPPORT|CLEAN_UP|UDHCP_DEBUG)|INSTALL_NO_USR))=.*/# \1 is not set/" .config
203 @./scripts/config/conf -o $(CONFIG_CONFIG_IN) 203 @./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
204 204
205 205
206allbareconfig: scripts/config/conf 206allbareconfig: scripts/config/conf
207 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) 207 @./scripts/config/conf -y $(CONFIG_CONFIG_IN) > /dev/null
208 @$(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 208 @$(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
209 @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config 209 @$(SED) -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config
210 @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config 210 @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config
211 @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN) 211 @yes n | ./scripts/config/conf -o $(CONFIG_CONFIG_IN) > /dev/null
212 212
213else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y) 213else # ifneq ($(strip $(HAVE_DOT_CONFIG)),y)
214 214