summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--GL/mesa/X/Makefile.am1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6529b2bf8..27c6722df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ * GL/mesa/X/Makefile.am:
+ Fix GL build when srcdir != builddir (Donnie Berkholz).
+
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
* configure.ac:
* include/dix-config.h.in:
* include/xorg-server.h.in:
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 56b62e765..806e238f3 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
-I../swrast_setup \
-I../tnl \
-I.. \
+ -I../../glx \
-I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/include \
-I$(top_srcdir)/hw/xfree86/os-support