summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-05 00:18:49 -0800
committerLinus Torvalds <torvalds@athlon.transmeta.com>2002-02-05 00:18:49 -0800
commit1ea864f1c53bc771294e61cf9be43b1d22e78f4c (patch)
treede928ec3d1e22abf7b0963e59092152daa5a2ecb /scripts
parent2f886464aa00cd9eb9cf46c8c155a24a752bb317 (diff)
v2.5.2.6 -> v2.5.3
- Doug Ledford: i810 audio driver update - Evgeniy Polyakov: update various SCSI drivers to new locking - David Howells: syscall latency improvement, try 2 - Francois Romieu: dscc4 driver update - Patrick Mochel: driver model fixes - Andrew Morton: clean up a few details in ext3 inode initialization - Pete Wyckoff: make x86 machine check print out right address.. - Hans Reiser: reiserfs update - Richard Gooch: devfs update - Greg KH: USB updates - Dave Jones: PNPBIOS - Nathan Scott: extended attributes - Corey Minyard: clean up zlib duplication (triplication..)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Menuconfig35
1 files changed, 15 insertions, 20 deletions
diff --git a/scripts/Menuconfig b/scripts/Menuconfig
index 8fb747899740..614f0e1d1293 100644
--- a/scripts/Menuconfig
+++ b/scripts/Menuconfig
@@ -357,19 +357,18 @@ function choice () {
#
-# Extract available help for an option from Configure.help
+# Extract available help for an option from Config.help
# and send it to standard output.
#
# Most of this function was borrowed from the original kernel
# Configure script.
#
function extract_help () {
- if [ -f Documentation/Configure.help ]
- then
- #first escape regexp special characters in the argument:
- var=$(echo "$1"|sed 's/[][\/.^$*]/\\&/g')
- #now pick out the right help text:
- text=$(sed -n "/^$var[ ]*\$/,\${
+ #first escape regexp special characters in the argument:
+ var=$(echo "$1"|sed 's/[][\/.^$*]/\\&/g')
+ #now pick out the right help text:
+ text=$(cat /dev/null $(find . -name Config.help) |
+ sed -n "/^$var[ ]*\$/,\${
/^$var[ ]*\$/c\\
${var}:\\
@@ -378,19 +377,15 @@ ${var}:\\
s/^ //
/<file:\\([^>]*\\)>/s//\\1/g
p
- }" Documentation/Configure.help)
-
- if [ -z "$text" ]
- then
- echo "There is no help available for this kernel option."
- return 1
- else
- echo "$text"
- fi
- else
- echo "There is no help available for this kernel option."
- return 1
- fi
+ }")
+
+ if [ -z "$text" ]
+ then
+ echo "There is no help available for this kernel option."
+ return 1
+ else
+ echo "$text"
+ fi
}
#