xserver: Branch 'server-1.2-branch'

[Matthieu Herrb]

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

New commits:
diff-tree dabf0328535674ea19b7884a98854c09a50ac88c (from e9fb258d0977c5a642f1df000fb5063cc508abf5)
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Oct 29 17:49:46 2006 +0100

    kill GNU-make'ism.
    (cherry picked from 59584c375f4e4b2670a92002ecb7a78a0bc50cce commit)

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 79d2ec5..b62ceaf 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 $< $@
+	cp xorgconf.cpp $@