Mercurial > hg > toybox
changeset 496:f0247cfc37f2
Don't mix the the probed symbols with the command symbols.
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 23 Feb 2012 21:03:18 -0600 |
parents | 5f224a5773d6 |
children | da73bb464ce8 |
files | Config.in scripts/genconfig.sh |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Config.in Thu Feb 23 20:56:10 2012 -0600 +++ b/Config.in Thu Feb 23 21:03:18 2012 -0600 @@ -44,6 +44,8 @@ endmenu +source generated/Config.probed + menu "Toys" source generated/Config.in endmenu
--- a/scripts/genconfig.sh Thu Feb 23 20:56:10 2012 -0600 +++ b/scripts/genconfig.sh Thu Feb 23 21:03:18 2012 -0600 @@ -8,7 +8,7 @@ source configure -genconfig() +probeconfig() { # Probe for container support on target @@ -19,7 +19,9 @@ 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 @@ done } -genconfig > generated/Config.in || rm "$OUTFILE" +probeconfig > generated/Config.probed || rm generated/Config.probed +genconfig > generated/Config.in || rm generated/Config.in