aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-08-02 10:02:23 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-08-02 10:02:23 +0000
commit3c19be904348ec54a596d4eae7c79b0157e0b0bc (patch)
tree6a2737ab0211e497b9ec255120fb9405c2cbd3ec
parenta9ee89f0438740ceae562c126d117c0d1d5e63bf (diff)
downloadbusybox-w32-3c19be904348ec54a596d4eae7c79b0157e0b0bc.tar.gz
busybox-w32-3c19be904348ec54a596d4eae7c79b0157e0b0bc.tar.bz2
busybox-w32-3c19be904348ec54a596d4eae7c79b0157e0b0bc.zip
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... git-svn-id: svn://busybox.net/trunk/busybox@11023 69ca8d6d-28ef-0310-b511-8ec308f3f277
-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
212 @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN) 212 @$(top_builddir)/scripts/config/conf -o $(CONFIG_CONFIG_IN)
213 213
214include/bb_config.h: include/config.h 214include/bb_config.h: include/config.h
215 echo "#ifndef AUTOCONF_INCLUDED" > $@ 215 echo -e "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H" > $@
216 sed -e 's/#undef CONFIG_\(.*\)/#define ENABLE_\1 0/' \ 216 sed -e 's/#undef CONFIG_\(.*\)/#define ENABLE_\1 0/' \
217 -e 's/#define CONFIG_\(.*\)/#define CONFIG_\1\n#define ENABLE_\1/' \ 217 -e 's/#define CONFIG_\(.*\)/#define CONFIG_\1\n#define ENABLE_\1/' \
218 < $< >> $@ 218 < $< >> $@