From 9a8aeeea1334eb8dc97061973707675e46f295ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= <jpandre@users.sourceforge.net>
Date: Thu, 2 Aug 2018 16:47:16 +0200
Subject: [PATCH] Prevented locally defined headers from interfering with
 ntfs-3g ones

Order the include directories so that those defined for ntfs-3g have
priority over locally defined ones.
---
 libfuse-lite/Makefile.am | 5 ++++-
 libntfs-3g/Makefile.am   | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libfuse-lite/Makefile.am b/libfuse-lite/Makefile.am
index d9591ec4..ba2934cf 100644
--- a/libfuse-lite/Makefile.am
+++ b/libfuse-lite/Makefile.am
@@ -7,7 +7,10 @@ endif
 
 libfuse_lite_la_CFLAGS=			  \
 	$(AM_CFLAGS) 			  \
-	$(LIBFUSE_LITE_CFLAGS)		  \
+	$(LIBFUSE_LITE_CFLAGS)
+
+libfuse_lite_la_CPPFLAGS=		  \
+	$(AM_CPPFLAGS) 			  \
 	-I$(top_srcdir)/include/fuse-lite
 
 libfuse_lite_la_LIBADD  = $(LIBFUSE_LITE_LIBS)
diff --git a/libntfs-3g/Makefile.am b/libntfs-3g/Makefile.am
index d6b150e5..6feba7d7 100644
--- a/libntfs-3g/Makefile.am
+++ b/libntfs-3g/Makefile.am
@@ -9,8 +9,8 @@ else
 noinst_LTLIBRARIES = libntfs-3g.la
 endif
 
-libntfs_3g_la_CFLAGS  = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
-libntfs_3g_la_CPPFLAGS= $(AM_CPPFLAGS) $(LIBNTFS_CPPFLAGS)
+libntfs_3g_la_CFLAGS  = $(AM_CFLAGS)
+libntfs_3g_la_CPPFLAGS= $(AM_CPPFLAGS) $(LIBNTFS_CPPFLAGS) -I$(top_srcdir)/include/ntfs-3g
 libntfs_3g_la_LIBADD  = $(LIBNTFS_LIBS)
 libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined