diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2018-02-11 10:53:59 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2018-02-11 10:53:59 +0800 |
| commit | 22eb197d6cbfbf9f71b2f64aede89080af82ae7f (patch) | |
| tree | d68752c7667d6a12368c5b51bae24e46e96840f3 | |
| parent | 3953018c2d901e8b48b7289988e4735a491a9fe5 (diff) | |
Fix building default_options.h
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | default_options.h.in | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index 5c4e106..1ffb2d9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,7 +234,6 @@ tidy: # 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 --git a/default_options.h.in b/default_options.h.in index c44fb97..b0641e4 100644 --- a/default_options.h.in +++ b/default_options.h.in @@ -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 |