diff -r 2d90ec981ba3 -r 896cb0d36c1a config/config.mk
--- a/config/config.mk	Tue Jun 08 23:26:54 2010 +0200
+++ b/config/config.mk	Sun May 08 19:02:44 2011 +0200
@@ -80,7 +80,7 @@
 	$(SILENT)(echo "# $(2) menu";                                           \
 	  echo "# Generated file, do not edit!!!";                              \
 	  echo "";                                                              \
-	  echo "choice";                                                        \
+	  echo "choice GEN_CHOICE_$(3)";                                        \
 	  echo "    bool";                                                      \
 	  echo "    prompt \"$(2)\"";                                           \
 	  echo "";                                                              \
@@ -90,13 +90,13 @@
 	    echo "config $(3)_$${_entry}";                                      \
 	    echo "    bool";                                                    \
 	    echo "    prompt \"$${entry}\"";                                    \
-	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
-	    if [ -n "$${dep_val}" ]; then                                       \
-	      echo "    $${dep_val#\# }";                                       \
-	    fi;                                                                 \
 	    if [ "$(5)" = "Y" ]; then                                           \
 	      echo "    depends on $(3)_$${_entry}_AVAILABLE";                  \
 	    fi;                                                                 \
+	    sed -r -e '/^## depends on /!d; s/^## /    /;' $${file} 2>/dev/null;\
+	    sed -r -e '/^## select /!d; s/^## /    /;' $${file} 2>/dev/null;    \
+		echo "    help";                                                    \
+	    sed -r -e '/^## help ?/!d; s/^## help ?/      /;' $${file} 2>/dev/null; \
 	    echo "";                                                            \
 	  done;                                                                 \
 	  echo "endchoice";                                                     \
@@ -157,10 +157,11 @@
 	    echo "menuconfig $(3)_$${_entry}";                                  \
 	    echo "    bool";                                                    \
 	    echo "    prompt \"$${entry}\"";                                    \
-	    dep_val=$$($(grep) -E '^# depends on ' $${file} 2>/dev/null);       \
-	    if [ -n "$${dep_val}" ]; then                                       \
-	      echo "    $${dep_val#\# }";                                       \
-	    fi;                                                                 \
+	    sed -r -e '/^## depends on /!d; s/^## /    /;' $${file} 2>/dev/null;\
+	    sed -r -e '/^## select /!d; s/^## /    /;' $${file} 2>/dev/null;    \
+		echo "    help";                                                    \
+	    sed -r -e '/^## help ?/!d; s/^## help ?/      /;' $${file} 2>/dev/null; \
+	    echo "";                                                            \
 	    echo "if $(3)_$${_entry}";                                          \
 	    echo "source \"$${file}\"";                                         \
 	    echo "endif";                                                       \