From: Rob Landley <rob@landley.net>
Date: Tue, 2 Aug 2005 10:02:23 +0000 (-0000)
Subject: In bb_config.h, replace AUTOCONF_INCLUDED guard with the more reasonable and
X-Git-Tag: 1_1_0~832
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=157e8071be672d530fb52a5560d2794821cbf15e;p=oweals%2Fbusybox.git

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...
---

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/' \
 		< $< >> $@