[BusyBox-cvs] svn commit: trunk/busybox

landley at busybox.net landley at busybox.net
Tue Aug 2 10:02:25 UTC 2005


Author: landley
Date: 2005-08-02 04:02:23 -0600 (Tue, 02 Aug 2005)
New Revision: 11023

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



Modified:
   trunk/busybox/Makefile


Changeset:
Modified: trunk/busybox/Makefile
===================================================================
--- trunk/busybox/Makefile	2005-08-02 05:30:31 UTC (rev 11022)
+++ trunk/busybox/Makefile	2005-08-02 10:02:23 UTC (rev 11023)
@@ -212,7 +212,7 @@
 	@$(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/' \
 		< $< >> $@




More information about the busybox-cvs mailing list