pixman: Branch 'master'

[Alan Coopersmith]

 pixman/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1e1c8a1f52183edecfea346257468681d6a88c36
Author: Oswald Buddenhagen <ossi at kde.org>
Date:   Thu May 1 10:50:58 2008 +0200

    fix pixman compile with srcdir != builddir
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 7f5ba8d..176189b 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -29,10 +29,10 @@ libpixmaninclude_HEADERS = pixman.h pixman-version.h
 noinst_LTLIBRARIES = 
 
 pixman-combine32.c : combine.inc combine.pl
-	$(PERL) $(srcdir)/combine.pl 8 < combine.inc > $@ || ($(RM) $@; exit 1)
+	$(PERL) $(srcdir)/combine.pl 8 < $(srcdir)/combine.inc > $@ || ($(RM) $@; exit 1)
 
 pixman-combine64.c : combine.inc combine.pl
-	$(PERL) $(srcdir)/combine.pl 16 < combine.inc > $@ || ($(RM) $@; exit 1)
+	$(PERL) $(srcdir)/combine.pl 16 < $(srcdir)/combine.inc > $@ || ($(RM) $@; exit 1)
 
 EXTRA_DIST = Makefile.win32 combine.inc combine.pl
 CLEANFILES = pixman-combine32.c pixman-combine64.c