THRIFT-1968 Thrift's include path is wrong in pkg-config files

THRIFT-1552 fix include path => thrift/Thrift.h

diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 05caf8c..9e18fcd 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
index ae05188..2c6a969
--- 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 (file)
new mode 100755 (executable)
index 846e362..5e60d84
--- 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 (file)
new mode 100755 (executable)
index 72f46bf..467d2e1
--- 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 (file)
new mode 100755 (executable)
index 7aec09f..d11e6db
--- 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}