You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2012/03/02 03:50:50 UTC

svn commit: r1296038 - /thrift/trunk/lib/c_glib/Makefile.am

Author: jfarrell
Date: Fri Mar  2 02:50:50 2012
New Revision: 1296038

URL: http://svn.apache.org/viewvc?rev=1296038&view=rev
Log:
THRIFT-1128:MAC OS X thrift.h incompatibility with Thrift.h
Client: cpp, c_glib
Patch: Jake Farrell

Moving c_glib headers into $(includedir)/thrift/c_glib to not collide with cpp headers.


Modified:
    thrift/trunk/lib/c_glib/Makefile.am

Modified: thrift/trunk/lib/c_glib/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/c_glib/Makefile.am?rev=1296038&r1=1296037&r2=1296038&view=diff
==============================================================================
--- thrift/trunk/lib/c_glib/Makefile.am (original)
+++ thrift/trunk/lib/c_glib/Makefile.am Fri Mar  2 02:50:50 2012
@@ -53,7 +53,7 @@ libthrift_c_glib_la_SOURCES = src/thrift
 
 libthrift_c_glib_la_CFLAGS = $(common_cflags)
 
-include_thriftdir = $(includedir)/thrift
+include_thriftdir = $(includedir)/thrift/c_glib
 include_thrift_HEADERS = \
                          $(top_builddir)/config.h \
                          src/thrift.h \