Fix sed regexp replacement, which I had hosed (thanks to

Jim Gleason for finding and fixing the problem)
 -Erik

diff --git a/applets/busybox.mkll b/applets/busybox.mkll
index fba0c8c818826aca61e291a4044e5f0b9c4e13a6..c650febd6714088d0d6e74763db8794222c9fda5 100755 (executable)
--- a/applets/busybox.mkll
+++ b/applets/busybox.mkll
@@ -4,8 +4,7 @@
 DF="busybox.def.h"
 MF="busybox.c"
 
-#LIST="$(sed -n '/^#define/{s/^#define BB_FEATURE_.*//g;s/^#define //p;}' $DF)"
-LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)"
+LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)"
 
 for def in ${LIST}; do
        i=`sed -n '/^#ifdef \<'$def'\>.*/,/^#endif/{ s/.*\"\(.*\)\".*\(_BB_DIR_[A-Z_]*\).*$/\2\/\1/gp; }' $MF`

diff --git a/busybox.mkll b/busybox.mkll
index fba0c8c818826aca61e291a4044e5f0b9c4e13a6..c650febd6714088d0d6e74763db8794222c9fda5 100755 (executable)
--- a/busybox.mkll
+++ b/busybox.mkll
@@ -4,8 +4,7 @@
 DF="busybox.def.h"
 MF="busybox.c"
 
-#LIST="$(sed -n '/^#define/{s/^#define BB_FEATURE_.*//g;s/^#define //p;}' $DF)"
-LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/\1/gp;' | sort)"
+LIST="$(gcc -E -dM $DF | sed -n -e '/^.*BB_FEATURE.*$/d;s/^#define.*\<BB_\(.*\)\>/BB_\1/gp;' | sort)"
 
 for def in ${LIST}; do
        i=`sed -n '/^#ifdef \<'$def'\>.*/,/^#endif/{ s/.*\"\(.*\)\".*\(_BB_DIR_[A-Z_]*\).*$/\2\/\1/gp; }' $MF`