From 16ee0d17a66c0bb67979507991f56ae8e898bfc4 Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Thu, 30 May 2013 09:57:00 +0200
Subject: [PATCH] THRIFT-1968 Thrift's include path is wrong in pkg-config
 files THRIFT-1552 fix include path => thrift/Thrift.h

---
 lib/cpp/Makefile.am     | 2 +-
 lib/cpp/thrift-nb.pc.in | 2 +-
 lib/cpp/thrift-qt.pc.in | 2 +-
 lib/cpp/thrift-z.pc.in  | 2 +-
 lib/cpp/thrift.pc.in    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 lib/cpp/thrift-nb.pc.in
 mode change 100644 => 100755 lib/cpp/thrift-qt.pc.in
 mode change 100644 => 100755 lib/cpp/thrift-z.pc.in
 mode change 100644 => 100755 lib/cpp/thrift.pc.in

diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 05caf8cd..9e18fcd8 100755
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -48,7 +48,7 @@ pkgconfig_DATA += thrift-qt.pc
 endif
 
 AM_CXXFLAGS = -Wall
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src -I$(srcdir)/src/thrift
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 # Define the source files for the module
diff --git a/lib/cpp/thrift-nb.pc.in b/lib/cpp/thrift-nb.pc.in
old mode 100644
new mode 100755
index ae051887..2c6a9697
--- a/lib/cpp/thrift-nb.pc.in
+++ b/lib/cpp/thrift-nb.pc.in
@@ -27,4 +27,4 @@ Description: Thrift Nonblocking API
 Version: @VERSION@
 Requires: thrift = @VERSION@
 Libs: -L${libdir} -lthriftnb
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}
diff --git a/lib/cpp/thrift-qt.pc.in b/lib/cpp/thrift-qt.pc.in
old mode 100644
new mode 100755
index 846e3623..5e60d840
--- a/lib/cpp/thrift-qt.pc.in
+++ b/lib/cpp/thrift-qt.pc.in
@@ -27,4 +27,4 @@ Description: Thrift Qt API
 Version: @VERSION@
 Requires: thrift = @VERSION@
 Libs: -L${libdir} -lthriftqt
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}
diff --git a/lib/cpp/thrift-z.pc.in b/lib/cpp/thrift-z.pc.in
old mode 100644
new mode 100755
index 72f46bf9..467d2e11
--- a/lib/cpp/thrift-z.pc.in
+++ b/lib/cpp/thrift-z.pc.in
@@ -27,4 +27,4 @@ Description: Thrift Zlib API
 Version: @VERSION@
 Requires: thrift = @VERSION@
 Libs: -L${libdir} -lthriftz
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}
diff --git a/lib/cpp/thrift.pc.in b/lib/cpp/thrift.pc.in
old mode 100644
new mode 100755
index 7aec09f1..d11e6db2
--- a/lib/cpp/thrift.pc.in
+++ b/lib/cpp/thrift.pc.in
@@ -26,4 +26,4 @@ Name: Thrift
 Description: Thrift C++ API
 Version: @VERSION@
 Libs: -L${libdir} -lthrift
-Cflags: -I${includedir}/thrift
+Cflags: -I${includedir}
-- 
2.17.1