mention localoptions.h being build directory, fix underscore in CHANGES

This commit is contained in:
Matt Johnston 2018-03-01 22:12:30 +08:00
parent a0ab5e86b5
commit 8062a4e8d6
4 changed files with 7 additions and 4 deletions

View File

@ -2,12 +2,12 @@
> > > Configuration/compatibility changes > > > Configuration/compatibility changes
IMPORTANT IMPORTANT
Custom configuration is now specified in local_options.h rather than options.h Custom configuration is now specified in localoptions.h rather than options.h
Available options and defaults can be seen in default_options.h Available options and defaults can be seen in default_options.h
To migrate your configuration, compare your customised options.h against the To migrate your configuration, compare your customised options.h against the
upstream options.h from your relevant version. Any customised options should upstream options.h from your relevant version. Any customised options should
be put in localoptions.h be put in localoptions.h in the build directory.
- "configure --enable-static" should now be used instead of "make STATIC=1" - "configure --enable-static" should now be used instead of "make STATIC=1"
This will avoid 'hardened build' flags that conflict with static binaries This will avoid 'hardened build' flags that conflict with static binaries

View File

@ -3,6 +3,8 @@ Basic Dropbear build instructions:
- Edit localoptions.h to set which features you want. Available options - Edit localoptions.h to set which features you want. Available options
are described in default_options.h, these will be overridden by are described in default_options.h, these will be overridden by
anything set in localoptions.h anything set in localoptions.h
localoptions.h should be located in the build directory if you are
building out of tree.
- If using a Mercurial or Git checkout, "autoconf; autoheader" - If using a Mercurial or Git checkout, "autoconf; autoheader"

View File

@ -6,8 +6,8 @@
default_options.h documents compile-time options, and provides default values. default_options.h documents compile-time options, and provides default values.
Local customisation should be added to localoptions.h which is Local customisation should be added to localoptions.h which is
used if it exists. Options defined there will override any options in this used if it exists in the build directory. Options defined there will override
file. any options in this file.
Options can also be defined with -DDROPBEAR_XXX=[0,1] in Makefile CFLAGS Options can also be defined with -DDROPBEAR_XXX=[0,1] in Makefile CFLAGS

View File

@ -5,6 +5,7 @@
> > > Don't edit this file any more! < < < > > > Don't edit this file any more! < < <
Local compile-time configuration should be defined in localoptions.h Local compile-time configuration should be defined in localoptions.h
in the build directory.
See default_options.h.in for a description of the available options. See default_options.h.in for a description of the available options.
*/ */