# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1466517870 -28800
# Node ID e742c0e9b941ed086b91108548cc4ada96c88086
# Parent  251c5f7a6e96c0b7770d9592013c2d31600b2496# Parent  4fb9261ef02a91b5831323462a12dbe6993e48d2
merge

diff -r 251c5f7a6e96 -r e742c0e9b941 libtomcrypt/Makefile.in
--- a/libtomcrypt/Makefile.in	Sun Jun 19 20:38:38 2016 +0800
+++ b/libtomcrypt/Makefile.in	Tue Jun 21 22:04:30 2016 +0800
@@ -19,7 +19,7 @@
 
 # Compilation flags. Note the += does not write over the user's CFLAGS!
 # The rest of the flags come from the parent Dropbear makefile
-CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/
+CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
 
 # additional warnings (newer GCC 3.4 and higher)
 ifdef GCC_34
diff -r 251c5f7a6e96 -r e742c0e9b941 libtommath/Makefile.in
--- a/libtommath/Makefile.in	Sun Jun 19 20:38:38 2016 +0800
+++ b/libtommath/Makefile.in	Tue Jun 21 22:04:30 2016 +0800
@@ -9,7 +9,7 @@
 srcdir=@srcdir@
 
 # So that libtommath can include Dropbear headers for options and m_burn()
-CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../
+CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
 
 ifndef IGNORE_SPEED