From 1b7ad01f5e5ead83fbc06ff20248b085a15dc279 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 23 Feb 2012 21:03:18 -0600 Subject: Don't mix the the probed symbols with the command symbols. --- Config.in | 2 ++ scripts/genconfig.sh | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Config.in b/Config.in index fffd2870..7378fbcc 100644 --- a/Config.in +++ b/Config.in @@ -44,6 +44,8 @@ config TOYBOX_DEBUG endmenu +source generated/Config.probed + menu "Toys" source generated/Config.in endmenu diff --git a/scripts/genconfig.sh b/scripts/genconfig.sh index 30c7eba1..4ecff254 100755 --- a/scripts/genconfig.sh +++ b/scripts/genconfig.sh @@ -8,7 +8,7 @@ OUTFILE=generated/Config.in source configure -genconfig() +probeconfig() { # Probe for container support on target @@ -19,7 +19,9 @@ genconfig() EOF [ $? -eq 0 ] && DEFAULT=y || DEFAULT=n echo -e "\tdefault $DEFAULT\n" || return 1 - +} +genconfig() +{ # extract config stanzas from each command source file, in alphabetical order for i in $(ls -1 toys/*.c) @@ -31,4 +33,5 @@ EOF done } -genconfig > generated/Config.in || rm "$OUTFILE" +probeconfig > generated/Config.probed || rm generated/Config.probed +genconfig > generated/Config.in || rm generated/Config.in -- cgit v1.2.3