When including compat headers, use the compat dir as part of the path

so we are sure to get the correct header.

diff --git a/compat/fnmatch.c b/compat/fnmatch.c
index f50b522942ddf073668ea0b59d4a4b6644921b8b..81a7f2c44fc1da657e0d210a34a98f78888249cb 100644 (file)
--- a/compat/fnmatch.c
+++ b/compat/fnmatch.c
@@ -50,8 +50,8 @@
 #endif /* HAVE_STRINGS_H */
 
 #include "missing.h"
-#include "charclass.h"
-#include "fnmatch.h"
+#include "compat/charclass.h"
+#include "compat/fnmatch.h"
 
 #undef EOS
 #define        EOS     '\0'

diff --git a/compat/glob.c b/compat/glob.c
index 5f53f5e1839ce9cb2b2824007767237b3f57100e..ff479b88f900f38c57548531d772c970d731e961 100644 (file)
--- a/compat/glob.c
+++ b/compat/glob.c
@@ -96,8 +96,8 @@
 #include <pwd.h>
 
 #include "missing.h"
-#include "glob.h"
-#include "charclass.h"
+#include "compat/glob.h"
+#include "compat/charclass.h"
 
 #define        DOLLAR          '$'
 #define        DOT             '.'

diff --git a/compat/mksiglist.c b/compat/mksiglist.c
index d77ce4523366e7fa30ff2a1a9e55c0c319159d19..a72c3350a39d6791ecb168a4d93b09bd910e4f31 100644 (file)
--- a/compat/mksiglist.c
+++ b/compat/mksiglist.c
@@ -38,7 +38,7 @@ main(int argc, char *argv[])
     static char *my_sys_siglist[NSIG];
     int i;
 
-#include "mksiglist.h"
+#include "compat/mksiglist.h"
 
     printf("#include <config.h>\n");
     printf("#include <signal.h>\n");

diff --git a/compat/nanosleep.c b/compat/nanosleep.c
index d390defc889947a16afcd28ac113d9ddc28f3aea..435bf3f33017d0b31e0b8a180df34eed305b2537 100644 (file)
--- a/compat/nanosleep.c
+++ b/compat/nanosleep.c
@@ -25,7 +25,7 @@
 # include <time.h>
 #endif
 #ifndef HAVE_TIMESPEC
-# include "timespec.h"
+# include "compat/timespec.h"
 #endif
 #include <errno.h>
 

diff --git a/compat/utimes.c b/compat/utimes.c
index 626f725e9a888d6ab086b51febf8b581f6da8a2d..8d03a1dae49c9d5e89bbdeb35457b56a77428999 100644 (file)
--- a/compat/utimes.c
+++ b/compat/utimes.c
@@ -27,7 +27,7 @@
 #ifdef HAVE_UTIME_H
 # include <utime.h>
 #else
-# include "utime.h"
+# include "compat/utime.h"
 #endif
 
 #include "missing.h"