1.1 --- a/config/global/paths.in	Fri Aug 01 08:23:29 2008 +0000
     1.2 +++ b/config/global/paths.in	Mon Aug 31 12:05:52 2009 +0200
     1.3 @@ -60,36 +60,54 @@
     1.4  #      The reason you might also want to install elsewhere is if you are going
     1.5  #      to package your shinny new toolchain for distribution.
     1.6  
     1.7 -config CUSTOM_PATCH
     1.8 +choice
     1.9 +    prompt "Patches origin"
    1.10      bool
    1.11 -    prompt "Use custom patch directory"
    1.12 +    default PATCH_BUNDLED
    1.13 +
    1.14 +config PATCH_BUNDLED
    1.15 +    bool
    1.16 +    prompt "Bundled only"
    1.17 +    help
    1.18 +      Only apply patches bundled with crosstool-NG.
    1.19 +
    1.20 +config PATCH_LOCAL
    1.21 +    bool
    1.22 +    prompt "Local only"
    1.23 +    select PATCH_USE_LOCAL
    1.24 +    help
    1.25 +      Only apply your local patches.
    1.26 +
    1.27 +config PATCH_BUNDLED_LOCAL
    1.28 +    bool
    1.29 +    prompt "Bundled, then local"
    1.30 +    select PATCH_USE_LOCAL
    1.31 +    help
    1.32 +      Apply the patches bundled with crosstool-NG,
    1.33 +      then apply your local patches.
    1.34 +
    1.35 +endchoice
    1.36 +
    1.37 +config PATCH_ORDER
    1.38 +    string
    1.39 +    default "bundled"           if PATCH_BUNDLED
    1.40 +    default "local"             if PATCH_LOCAL
    1.41 +    default "bundled,local"     if PATCH_BUNDLED_LOCAL
    1.42 +
    1.43 +config PATCH_USE_LOCAL
    1.44 +    bool
    1.45      default n
    1.46 -    help
    1.47 -      If you have custom patches that you want to be applied, say 'Y' here and
    1.48 -      enter the path directory below.
    1.49 -      
    1.50 -      Note that you must ensure that the patch directory is arranged the same
    1.51 -      way the official directory is.
    1.52  
    1.53 -config CUSTOM_PATCH_ONLY
    1.54 -    bool
    1.55 -    prompt "Only use custom patches"
    1.56 -    default n
    1.57 -    depends on CUSTOM_PATCH
    1.58 -    help
    1.59 -      Don't apply patches coming with crosstool-NG, only those patches available
    1.60 -      in the directory below.
    1.61 -      
    1.62 -      If you say 'N' here, then the patches provided with crosstool-NG will be
    1.63 -      applied first, and then your patches.
    1.64 -
    1.65 -config CUSTOM_PATCH_DIR
    1.66 +config LOCAL_PATCH_DIR
    1.67      string
    1.68 -    prompt "Custom patch directory"
    1.69 +    prompt "|  Local patch directory"
    1.70      default ""
    1.71 -    depends on CUSTOM_PATCH
    1.72 +    depends on PATCH_USE_LOCAL
    1.73      help
    1.74        Enter the custom patch directory here.
    1.75 +      
    1.76 +      Note that you must ensure that the directory contianing your custom
    1.77 +      patches is arranged the same way the official directory is.
    1.78  
    1.79  config REMOVE_DOCS
    1.80      bool