aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2005-08-02 10:02:23 +0000
committerGravatar Rob Landley <rob@landley.net>2005-08-02 10:02:23 +0000
commit157e8071be672d530fb52a5560d2794821cbf15e (patch)
tree6a2737ab0211e497b9ec255120fb9405c2cbd3ec
parentff3a61b71d758025aa41596e16b9cdff5c53dc84 (diff)
downloadbusybox-157e8071be672d530fb52a5560d2794821cbf15e.tar.gz
busybox-157e8071be672d530fb52a5560d2794821cbf15e.tar.bz2
In bb_config.h, replace AUTOCONF_INCLUDED guard with the more reasonable and
obvious (and less side-effect prone in strange build environments) BB_CONFIG_H. Yeah, I know Erik ripped it out of our copy of menuconfig (which is a good thing), but that doesn't fix people whose headers have it inherited from linux-kernel headers or old versions of uclibc, and Erik's fix could easily get forgotten and reverted the next time we update menuconfig anyway...
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5e6363629..adc2d0c26 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,7 @@ include/config.h: .config
@$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN)
include/bb_config.h: include/config.h
- echo "#ifndef AUTOCONF_INCLUDED" > $@
+ echo -e "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H" > $@
sed -e 's/#undef CONFIG_\(.*\)/#define ENABLE_\1 0/' \
-e 's/#define CONFIG_\(.*\)/#define CONFIG_\1\n#define ENABLE_\1/' \
< $< >> $@