[PATCH v2 xserver 5/7] hw/xquartz: fix path to pseudoramiX headers
Mihail Konev
k.mvc at ya.ru
Tue Apr 4 23:49:44 UTC 2017
Fixes out-of-source XQuartz build.
Fixes: 39c548da ("XQuartz: Fix build with moved pseudoramiX")
Signed-off-by: Mihail Konev <k.mvc at ya.ru>
---
v2: Reword. Add missing Cc.
hw/xquartz/Makefile.am | 2 +-
hw/xquartz/xpr/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 4da896d76173..5ccbe48917bc 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-DUSE_NEW_CLUT \
-DXFree86Server \
-I$(top_srcdir)/miext/rootless \
- -I$(top_builddir)/pseudoramiX \
+ -I$(top_srcdir)/pseudoramiX \
-DX11LIBDIR=\"$(libdir)\"
if GLX
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index c654ee595cb9..e4b138617805 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libXquartzXpr.la
AM_CFLAGS = $(DIX_CFLAGS)
AM_CPPFLAGS = \
-I$(srcdir) -I$(srcdir)/.. \
- -I$(top_builddir)/pseudoramiX \
+ -I$(top_srcdir)/pseudoramiX \
-I$(top_srcdir)/miext \
-I$(top_srcdir)/miext/rootless
--
2.9.2
More information about the xorg-devel
mailing list