xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/os-support/solaris/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5da9b255a64bec7dbf5ddb392d54dac9be5b43c0
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Mon Aug 3 19:53:27 2009 -0700

    Fix blddir != srcdir builds of solaris-*.il files
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=17509
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index c09ae32..c7ac08b 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -14,7 +14,7 @@ SOLARIS_INOUT_SRC = solaris- at SOLARIS_INOUT_ARCH@.S
 DISTCLEANFILES = solaris- at SOLARIS_INOUT_ARCH@.il
 
 solaris- at SOLARIS_INOUT_ARCH@.il: solaris- at SOLARIS_INOUT_ARCH@.S
-	$(CPP) -P -DINLINE_ASM solaris- at SOLARIS_INOUT_ARCH@.S > $@
+	$(CPP) -P -DINLINE_ASM $(srcdir)/solaris- at SOLARIS_INOUT_ARCH@.S > $@
 
 noinst_LTLIBRARIES = libsolaris.la
 libsolaris_la_SOURCES = sun_init.c \