diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/Makefile.am ftgl-2.1.3~rc5/Makefile.am
--- ftgl-2.1.3~rc5.orig/Makefile.am	2008-05-12 14:04:08.000000000 -0400
+++ ftgl-2.1.3~rc5/Makefile.am	2015-03-14 17:25:44.000000000 -0400
@@ -1,7 +1,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src test demo docs
+SUBDIRS = src docs
 DIST_SUBDIRS = $(SUBDIRS) msvc
 
 pkgconfigdir = $(libdir)/pkgconfig
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/configure.ac ftgl-2.1.3~rc5/configure.ac
--- ftgl-2.1.3~rc5.orig/configure.ac	2008-06-12 09:14:43.000000000 -0400
+++ ftgl-2.1.3~rc5/configure.ac	2015-03-14 16:50:27.000000000 -0400
@@ -54,11 +54,6 @@
 AC_MSG_RESULT($CPPUNIT)
 AM_CONDITIONAL(HAVE_CPPUNIT, test "x$CPPUNIT" != "xno")
 
-dnl search the include directory (required for non-srcdir builds).
-dnl should come after the system services checks otherwise headers
-dnl may conflict.
-CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src"
-
 # Warning flags
 CPPFLAGS="${CPPFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
 CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/demo/Makefile.am ftgl-2.1.3~rc5/demo/Makefile.am
--- ftgl-2.1.3~rc5.orig/demo/Makefile.am	2008-06-01 21:10:10.000000000 -0400
+++ ftgl-2.1.3~rc5/demo/Makefile.am	2015-03-14 17:09:17.000000000 -0400
@@ -3,20 +3,18 @@
 noinst_PROGRAMS = simple c-demo FTGLDemo FTGLMFontDemo
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/src $(FT2_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/src $(FT2_CFLAGS) $(GL_CFLAGS)
 
 simple_SOURCES = \
     simple.cpp \
     $(NULL)
-simple_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+simple_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
 simple_LDADD = ../src/libftgl.la
 
 c_demo_SOURCES = \
     c-demo.c \
     $(NULL)
-c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+c_demo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
 c_demo_LDADD = ../src/libftgl.la
 
 FTGLDemo_SOURCES = \
@@ -26,8 +24,7 @@
 	trackball.c \
 	trackball.h \
 	$(NULL)
-FTGLDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+FTGLDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
 FTGLDemo_LDADD = ../src/libftgl.la
 
 FTGLMFontDemo_SOURCES = \
@@ -37,8 +34,7 @@
 	trackball.c \
 	trackball.h \
 	$(NULL)
-FTGLMFontDemo_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+FTGLMFontDemo_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS)
 FTGLMFontDemo_LDADD = ../src/libftgl.la
 
 NULL =
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/docs/Makefile.am ftgl-2.1.3~rc5/docs/Makefile.am
--- ftgl-2.1.3~rc5.orig/docs/Makefile.am	2008-05-22 15:22:59.000000000 -0400
+++ ftgl-2.1.3~rc5/docs/Makefile.am	2015-03-14 16:26:36.000000000 -0400
@@ -1,5 +1,5 @@
 
-documentationdir = $(datadir)/doc/ftgl
+documentationdir = $(datadir)/doc/libftgl2
 documentation_DATA = projects_using_ftgl.txt
 
 if HAVE_DOXYGEN
@@ -28,7 +28,7 @@
 html/doxygen.css: stamp-doxygen
 stamp-doxygen: doxygen.cfg stamp-eps
 	$(DOXYGEN) $^
-	sed -i 's/%FTGL/FTGL/' html/*html
+	sed -i -e 's/%FTGL/FTGL/' html/*html
 	touch $@
 
 latex/ftgl.pdf: stamp-latex
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/m4/gl.m4 ftgl-2.1.3~rc5/m4/gl.m4
--- ftgl-2.1.3~rc5.orig/m4/gl.m4	2008-05-05 10:48:57.000000000 -0400
+++ ftgl-2.1.3~rc5/m4/gl.m4	2015-03-14 16:26:36.000000000 -0400
@@ -44,10 +44,10 @@
 AC_MSG_CHECKING([for OpenGL framework (Darwin-specific)])
 FRAMEWORK_OPENGL=""
 PRELIBS="$LIBS"
-LIBS="$LIBS -Xlinker -framework -Xlinker OpenGL"
+LIBS="$LIBS -Wl,-framework,OpenGL"
 # -Xlinker is used because libtool is busted prior to 1.6 wrt frameworks
 AC_TRY_LINK([#include <OpenGL/gl.h>], [glBegin(GL_POINTS)],
-    [FRAMEWORK_OPENGL="-Xlinker -framework -Xlinker OpenGL" ; ac_cv_search_glBegin="-Xlinker -framework -Xlinker OpenGL" ; AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
+    [FRAMEWORK_OPENGL="-Wl,-framework,OpenGL" ; ac_cv_search_glBegin="-Wl,-framework,OpenGL" ; AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
 with_gl_lib="$FRAMEWORK_OPENGL"
 AC_SUBST(FRAMEWORK_OPENGL)
 LIBS="$PRELIBS"
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/src/Makefile.am ftgl-2.1.3~rc5/src/Makefile.am
--- ftgl-2.1.3~rc5.orig/src/Makefile.am	2008-05-23 03:13:42.000000000 -0400
+++ ftgl-2.1.3~rc5/src/Makefile.am	2015-03-14 16:46:50.000000000 -0400
@@ -28,8 +28,7 @@
     $(ftlayout_sources) \
     $(ftgl_headers) \
     $(NULL)
-libftgl_la_CPPFLAGS = -IFTGlyph -IFTFont -IFTLayout
-libftgl_la_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
+libftgl_la_CPPFLAGS = -IFTGlyph -IFTFont -IFTLayout -I$(top_srcdir)/src $(FT2_CFLAGS) $(GL_CFLAGS)
 libftgl_la_LDFLAGS = \
         -no-undefined -version-number $(LT_VERSION)
 libftgl_la_LIBADD = \
diff -Nurd -x'*~' ftgl-2.1.3~rc5.orig/test/Makefile.am ftgl-2.1.3~rc5/test/Makefile.am
--- ftgl-2.1.3~rc5.orig/test/Makefile.am	2008-06-01 21:10:10.000000000 -0400
+++ ftgl-2.1.3~rc5/test/Makefile.am	2015-03-14 17:04:08.000000000 -0400
@@ -43,28 +43,20 @@
     $(NULL)
 
 AM_CPPFLAGS = \
-    $(FT2_CPPFLAGS) \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/FTFont \
     -I$(top_srcdir)/src/FTGlyph \
     -I$(top_srcdir)/src/FTLayout \
+    $(FT2_CFLAGS) $(GL_CFLAGS) \
     $(NULL)
 
-CXXTest_CXXFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) -lcppunit
+CXXTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS) $(GL_LIBS) -lcppunit
 CXXTest_LDADD = ../src/libftgl.la
 
 CTest_SOURCES = \
     CTest.c \
     $(NULL)
-CTest_CPPFLAGS = \
-    -I$(top_srcdir)/include \
-    -I$(top_srcdir)/src \
-    -I$(top_srcdir)/src/FTGlyph \
-    -I$(top_srcdir)/src/FTFont \
-    -I$(top_srcdir)/src/FTLayout
-CTest_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
-CTest_LDFLAGS = $(FT2_LIBS) $(GLUT_LIBS)
+CTest_LDFLAGS = $(GLUT_LIBS)
 CTest_LDADD = ../src/libftgl.la
 
 NULL =