Fix includes not to rely on $(top_srcdir) being in the include path.

edit/edit-widget.h

@@ -1,7 +1,7 @@
 #ifndef __EDIT_WIDGET_H
 #define __EDIT_WIDGET_H
 
-#include "src/dialog.h"		/* Widget */
+#include "../src/dialog.h"		/* Widget */
 
 #define MAX_MACRO_LENGTH 1024
 #define N_LINE_CACHES 32

edit/edit.c

@@ -26,9 +26,9 @@
 #include "edit-widget.h"
 #include "editcmddef.h"
 
-#include "src/cmd.h"		/* view_other_cmd() */
-#include "src/user.h"		/* user_menu_cmd() */
-#include "src/wtools.h"		/* query_dialog() */
+#include "../src/cmd.h"		/* view_other_cmd() */
+#include "../src/user.h"	/* user_menu_cmd() */
+#include "../src/wtools.h"	/* query_dialog() */
 
 /*
    what editor are we going to emulate? one of EDIT_KEY_EMULATION_NORMAL

edit/edit.h

@@ -37,7 +37,7 @@
 
 #include <stdlib.h>
 
-#include "src/global.h"
+#include "../src/global.h"
 
 #define N_menus 5
 

edit/editcmd.c

@@ -31,16 +31,16 @@
 #include "editcmddef.h"
 #include "edit-widget.h"
 
-#include "src/color.h"		/* dialog_colors */
-#include "src/tty.h"		/* LINES */
-#include "src/widget.h"		/* listbox_new() */
-#include "src/layout.h"		/* clr_scr() */
-#include "src/main.h"		/* mc_home */
-#include "src/help.h"		/* interactive_display() */
-#include "src/key.h"		/* XCTRL */
-#include "src/dialog.h"		/* do_refresh() */
-#include "src/wtools.h"		/* message() */
-#include "src/charsets.h"
+#include "../src/color.h"	/* dialog_colors */
+#include "../src/tty.h"		/* LINES */
+#include "../src/widget.h"	/* listbox_new() */
+#include "../src/layout.h"	/* clr_scr() */
+#include "../src/main.h"	/* mc_home */
+#include "../src/help.h"	/* interactive_display() */
+#include "../src/key.h"		/* XCTRL */
+#include "../src/dialog.h"	/* do_refresh() */
+#include "../src/wtools.h"	/* message() */
+#include "../src/charsets.h"
 
 #define edit_get_load_file(f,h) input_dialog (h, _(" Enter file name: "), f)
 #define edit_get_save_file(f,h) input_dialog (h, _(" Enter file name: "), f)

edit/editdraw.c

@@ -26,12 +26,11 @@
 
 #define MAX_LINE_LEN 1024
 
-#include "src/color.h"		/* EDITOR_NORMAL_COLOR */
-#include "src/tty.h"		/* attrset() */
-#include "src/widget.h"		/* redraw_labels() */
-#include "src/key.h"		/* is_idle() */
-
-#include "src/charsets.h"
+#include "../src/color.h"	/* EDITOR_NORMAL_COLOR */
+#include "../src/tty.h"		/* attrset() */
+#include "../src/widget.h"	/* redraw_labels() */
+#include "../src/key.h"		/* is_idle() */
+#include "../src/charsets.h"
 
 /* Text styles */
 #define MOD_ABNORMAL		(1 << 8)

edit/editkeys.c

@@ -24,10 +24,10 @@
 #include "edit.h"
 #include "edit-widget.h"	/* edit->macro_i */
 #include "editcmddef.h"		/* list of commands */
-#include "src/key.h"		/* KEY_M_SHIFT */
-#include "src/tty.h"		/* keys */
-#include "src/charsets.h"	/* convert_from_input_c() */
-#include "src/selcodepage.h"	/* do_select_codepage() */
+#include "../src/key.h"		/* KEY_M_SHIFT */
+#include "../src/tty.h"		/* keys */
+#include "../src/charsets.h"	/* convert_from_input_c() */
+#include "../src/selcodepage.h"	/* do_select_codepage() */
 
 /*
  * Ordinary translations.  Note that the keys listed first take priority

edit/editlock.c

@@ -25,7 +25,7 @@
 #include "edit.h"
 #include "editlock.h"
 
-#include "src/wtools.h"		/* edit_query_dialog () */
+#include "../src/wtools.h"	/* edit_query_dialog () */
 
 #define BUF_SIZE 255
 #define PID_BUF_SIZE 10

edit/editmenu.c

@@ -23,12 +23,12 @@
 #include <config.h>
 
 #include "edit.h"
-#include "src/wtools.h"		/* query_dialog() */
-#include "src/menu.h"		/* menu_entry */
-#include "src/tty.h"		/* KEY_F */
-#include "src/key.h"		/* XCTRL */
-#include "src/main.h"		/* drop_menus */
-#include "src/learn.h"		/* learn_keys */
+#include "../src/wtools.h"	/* query_dialog() */
+#include "../src/menu.h"	/* menu_entry */
+#include "../src/tty.h"		/* KEY_F */
+#include "../src/key.h"		/* XCTRL */
+#include "../src/main.h"	/* drop_menus */
+#include "../src/learn.h"	/* learn_keys */
 
 #include "edit-widget.h"
 #include "editcmddef.h"

edit/editoptions.c

@@ -22,8 +22,8 @@
 
 #include <config.h>
 #include "edit.h"
-#include "src/dialog.h"		/* B_CANCEL */
-#include "src/wtools.h"		/* QuickDialog */
+#include "../src/dialog.h"	/* B_CANCEL */
+#include "../src/wtools.h"	/* QuickDialog */
 
 #define OPT_DLG_H 17
 #define OPT_DLG_W 72

edit/editwidget.c

@@ -24,10 +24,10 @@
 #include "edit.h"
 #include "edit-widget.h"
 
-#include "src/tty.h"		/* LINES */
-#include "src/widget.h"		/* redraw_labels() */
-#include "src/menu.h"		/* menubar_new() */
-#include "src/key.h"		/* is_idle() */
+#include "../src/tty.h"		/* LINES */
+#include "../src/widget.h"	/* redraw_labels() */
+#include "../src/menu.h"	/* menubar_new() */
+#include "../src/key.h"		/* is_idle() */
 
 WEdit *wedit;
 struct WMenu *edit_menubar;

edit/syntax.c

@@ -23,9 +23,9 @@
 #include <config.h>
 #include "edit.h"
 #include "edit-widget.h"
-#include "src/color.h"		/* use_colors */
-#include "src/main.h"		/* mc_home */
-#include "src/wtools.h"		/* message() */
+#include "../src/color.h"	/* use_colors */
+#include "../src/main.h"	/* mc_home */
+#include "../src/wtools.h"	/* message() */
 
 /* bytes */
 #define SYNTAX_MARKER_DENSITY 512

src/myslang.h

@@ -8,7 +8,7 @@
 #    include <slang.h>
 #endif
 #else /* !HAVE_SYSTEM_SLANG */
-#    include "slang/include/slang.h"
+#    include "../slang/include/slang.h"
 #endif /* !HAVE_SYSTEM_SLANG */
 
 enum {

src/user.c

@@ -33,8 +33,8 @@
 #include "execute.h"
 #include "setup.h"
 
-#include "edit/edit.h"		/* BLOCK_FILE */
-#include "edit/edit-widget.h"	/* WEdit */
+#include "../edit/edit.h"		/* BLOCK_FILE */
+#include "../edit/edit-widget.h"	/* WEdit */
 
 /* For the simple listbox manager */
 #include "dialog.h"