# HG changeset patch # User Matt Johnston # Date 1518317639 -28800 # Node ID abbdeca6f1bdb20151f5aa098b1d1275097dc670 # Parent b0c3b46372dce41477bdff8eadacdd219ef6176d Fix building default_options.h diff -r b0c3b46372dc -r abbdeca6f1bd Makefile.in --- a/Makefile.in Sat Feb 10 19:25:00 2018 +0800 +++ b/Makefile.in Sun Feb 11 10:53:59 2018 +0800 @@ -234,7 +234,6 @@ # default_options.h is stored in version control, could not find a workaround # for parallel "make -j" and dependency rules. default_options.h: default_options.h.in - echo "# > > > Generated from $^, edit that file instead !" > $@.tmp - echo >> $@.tmp - $(srcdir)/ifndef_wrapper.sh < $^ > $@.tmp + echo "/*\n > > > Do not edit this file (default_options.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > $@.tmp + $(srcdir)/ifndef_wrapper.sh < $^ >> $@.tmp mv $@.tmp $@ diff -r b0c3b46372dc -r abbdeca6f1bd default_options.h.in --- a/default_options.h.in Sat Feb 10 19:25:00 2018 +0800 +++ b/default_options.h.in Sun Feb 11 10:53:59 2018 +0800 @@ -3,12 +3,11 @@ /* > > > Read This < < < -default_options.h.in (this file) documents compile-time options, and provides -default values. +default_options.h.in documents compile-time options, and provides default values. Local customisation should be added to localoptions.h which is used if it exists. Options defined there will override any options in this -file (#ifndef guards added by ifndef_wrapper.sh). +file. Options can also be defined with -DDROPBEAR_XXX in Makefile CFLAGS