# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1473426512 -28800
# Node ID 8493172e4f3cb48f5d7240b82385ed16022b41c0
# Parent  21156be2bb269db81f49c8d9e2ecfbecca5f88b4# Parent  19358268ea45afdcaa14512fa17c772837445ec2
merge

diff -r 21156be2bb26 -r 8493172e4f3c libtomcrypt/Makefile.in
--- a/libtomcrypt/Makefile.in	Thu Sep 01 23:08:56 2016 +0800
+++ b/libtomcrypt/Makefile.in	Fri Sep 09 21:08:32 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 21156be2bb26 -r 8493172e4f3c libtommath/Makefile.in
--- a/libtommath/Makefile.in	Thu Sep 01 23:08:56 2016 +0800
+++ b/libtommath/Makefile.in	Fri Sep 09 21:08:32 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