xserver: Branch 'server-1.2-branch'

[Matthieu Herrb]

 hw/xfree86/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 00e82378398052d365d1b131092e676ede7535d1 (from dabf0328535674ea19b7884a98854c09a50ac88c)
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Oct 29 18:19:56 2006 +0100

    Handle building in a separate objdir
    (cherry picked from 645d0576205532a3610ae351267d5b84d76236bd commit)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index b62ceaf..64c54f8 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -103,4 +103,4 @@ relink:
 	rm -f Xorg && $(MAKE) Xorg
 
 xorg.conf.example.pre: xorgconf.cpp
-	cp xorgconf.cpp $@
+	cp $(srcdir)/xorgconf.cpp $@