Index: Makefile.in
--- Makefile.in.orig	2018-01-31 04:00:45.000000000 +0100
+++ Makefile.in	2018-01-31 08:32:21.573999000 +0100
@@ -718,10 +718,6 @@
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"EXPECT=$(EXPECT)" \
 	"FLEX=$(FLEX)" \
-	"INSTALL=$(INSTALL)" \
-	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
 	"LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
 	"LEX=$(LEX)" \
 	"M4=$(M4)" \
Index: gdb/configure
--- gdb/configure.orig	2018-01-31 08:32:21.576965000 +0100
+++ gdb/configure	2018-01-31 08:36:23.701664000 +0100
@@ -12076,7 +12076,7 @@
 done
 
 
-for ac_header in curses.h cursesX.h ncurses.h ncursesw/ncurses.h ncurses/ncurses.h ncurses/term.h
+for ac_header in ncurses.h ncursesw/ncurses.h ncurses/ncurses.h ncurses/term.h curses.h cursesX.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"