From 74adf784461325eb8962214e77cc7c89e9957c9c Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Tue, 14 Jan 2014 13:37:51 -0500
Subject: [PATCH] Fix include directories for libwbxml

---
 ActiveSync/GNUmakefile         | 2 +-
 ActiveSync/NSData+ActiveSync.m | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ActiveSync/GNUmakefile b/ActiveSync/GNUmakefile
index e6d2d2ed7..012ffabd6 100644
--- a/ActiveSync/GNUmakefile
+++ b/ActiveSync/GNUmakefile
@@ -29,7 +29,7 @@ ActiveSync_RESOURCE_FILES +=		\
 ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ -I../SoObjects/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_INCLUDE_DIRS += -I/usr/local/include/libwbxml-1.0/wbxml/
+ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
 ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
 
 -include GNUmakefile.preamble
diff --git a/ActiveSync/NSData+ActiveSync.m b/ActiveSync/NSData+ActiveSync.m
index 5654d606c..3c6601fbf 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -31,9 +31,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import <Foundation/NSString.h>
 
-#include <wbxml.h>
-#include <wbxml_conv.h>
-#include <wbxml_errors.h>
+#include <wbxml/wbxml.h>
+#include <wbxml/wbxml_conv.h>
+#include <wbxml/wbxml_errors.h>
 
 #define WBXMLDEBUG 0