Cygwin: utils: enable -idirafter to fetch Cygwin headers from mingw sources

Get rid of the last dreaded relative paths pointing to the cygwin dir.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

winsup/utils/mingw/Makefile.am

@@ -29,7 +29,7 @@ cygcheck_SOURCES = \
 	cygcheck.cc \
 	dump_setup.cc \
 	path.cc
-cygcheck_CPPFLAGS=-I$(srcdir)/..
+cygcheck_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include
 cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll
 
 cygwin_console_helper_SOURCES = cygwin-console-helper.cc
@@ -47,7 +47,7 @@ noinst_PROGRAMS = path-testsuite
 path_testsuite_SOURCES = \
 	path.cc \
 	testsuite.cc
-path_testsuite_CPPFLAGS=-I$(srcdir)/..
+path_testsuite_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include
 path_testsuite_CXXFLAGS = -DTESTSUITE
 
 TESTS = path-testsuite

winsup/utils/mingw/cygcheck.cc

@@ -20,10 +20,10 @@
 #include "path.h"
 #include "wide_path.h"
 #include <getopt.h>
-#include "../cygwin/include/cygwin/version.h"
-#include "../cygwin/include/sys/cygwin.h"
+#include <cygwin/version.h>
+#include <sys/cygwin.h>
 #define _NOMNTENT_MACROS
-#include "../cygwin/include/mntent.h"
+#include <mntent.h>
 #undef cygwin_internal
 #include "loadlib.h"
 

winsup/utils/mingw/testsuite.h

@@ -7,8 +7,8 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "path.h"
-#include "../cygwin/include/cygwin/bits.h"
-#include "../cygwin/include/sys/mount.h"
+#include <cygwin/bits.h>
+#include <sys/mount.h>
 
 /* This file implements a test harness for the MinGW implementation of
    POSIX path translation in utils/path.cc.  This code is used by strace

winsup/utils/path.cc

@@ -20,11 +20,11 @@ details. */
 #include <malloc.h>
 #include <wchar.h>
 #include "path.h"
-#include "../cygwin/include/cygwin/version.h"
-#include "../cygwin/include/cygwin/bits.h"
-#include "../cygwin/include/sys/mount.h"
+#include <cygwin/version.h>
+#include <cygwin/bits.h>
+#include <sys/mount.h>
 #define _NOMNTENT_MACROS
-#include "../cygwin/include/mntent.h"
+#include <mntent.h>
 #ifdef FSTAB_ONLY
 #include <sys/cygwin.h>
 #endif