[openap-cvs] : openap-main/scripts Menuconfig,1.5,1.6

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/openap-main/scripts
In directory subversions:/tmp/cvs-serv32500

Modified Files:
        Menuconfig 
Log Message:
make help work when inside the Linux configuration


Index: Menuconfig
===================================================================
RCS file: /cvsroot/openap/openap-main/scripts/Menuconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Menuconfig  31 Jul 2002 14:37:29 -0000      1.5
+++ Menuconfig  31 Jul 2002 22:56:24 -0000      1.6
@@ -364,8 +364,19 @@
 # Configure script.
 #
 function extract_help () {
-  if [ -f config/Configure.help ]
-  then
+
+
+  # FIXME: it would be nice to have the right Configure.help figured
+  # out based on set_prefix and end_prefix rather than hard coding
+  # our choices here.
+  docfiles="linux/Documentation/Configure.help config/Configure.help"
+
+  for docfile in $docfiles; do
+  
+      if [ ! -f $docfile ] ; then
+          continue
+      fi
+
      #first escape regexp special characters in the argument:
      var=$(echo "$1"|sed 's/[][\/.^$*]/\\&/g')
      #now pick out the right help text:
@@ -378,19 +389,18 @@
                         s/^  //
                        /<file:\\([^>]*\\)>/s//\\1/g
                         p
-                    }" config/Configure.help)
+                    }" $docfile)
 
-     if [ -z "$text" ]
-     then
-          echo "There is no help available for this kernel option."
-         return 1
-     else
+     if [ -n "$text" ] ; then
          echo "$text"
+         return 0
      fi
-  else
-        echo "There is no help available for this kernel option."
-         return 1
-  fi
+  
+  done
+ 
+  echo "There is no help available for this kernel option."
+  return 1
+     
 }
 
 #