summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorAndreas Boll <[email protected]>2013-03-16 14:00:44 +0100
committerIan Romanick <[email protected]>2013-04-05 19:01:09 -0700
commit6e8f8a959b72d9bab046dadcba697a16bde89082 (patch)
tree2c357bb8db19e7215f9eb4fb9069ec98d0f6d554 /src/mesa
parent0c0e72f7560c6bf7d7c12da43559a4e53262faa4 (diff)
osmesa: fix out-of-tree build
Taken from downstream: http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=blob;f=debian/patches/14-fix-osmesa-build.diff;h=00581d0e1833c5492d9050e1bf3d5e658cad782e;hb=refs/heads/ubuntu%2B1 v2: Move the added line immediately after -I$(top_srcdir)/src/mapi NOTE: This is a candidate for the 9.1 and 9.0 branches. Acked-by: Kenneth Graunke <[email protected]> (v1) Reviewed-by: Matt Turner <[email protected]> (cherry picked from commit 92e6260c1960f78692417433206c38170ec1a625)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/osmesa/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index c4b178b7495..250340146c0 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -24,6 +24,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \
+ -I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
$(DEFINES) \
$(API_DEFINES)