xserver: Branch 'master' - 2 commits

[Ben Byer]

 hw/darwin/Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 0ccd1443fd6db397b42e5b99ce733ce1316c785e (from parents)
Merge: ec1ef8a56d6217ca2b04899043874ce0bcad9784 9b6bb06f13a71f6078f762b4a78fa516faccb638
Author: Ben Byer <bbyer at bbyer.(none)>
Date:   Tue Mar 6 01:04:50 2007 -0800

    Merge branch 'master' of git+ssh://bbyer@git.freedesktop.org/git/xorg/xserver

diff-tree ec1ef8a56d6217ca2b04899043874ce0bcad9784 (from 33d2cf93fb50464941e74efe246b10aee212223a)
Author: Ben Byer <bbyer at bbyer.(none)>
Date:   Tue Mar 6 00:57:23 2007 -0800

    Fixed Darwin's Makefile.am to fix a problem building X11.app

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 75d028e..3e28d32 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -112,7 +112,7 @@ macos_PROGRAMS = XDarwinApp
 macos_SCRIPTS = x11app
 
 x11app:
-	cd apple && xcodebuild
+	cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
 
 XDarwinApp_SOURCES = \
                 $(top_srcdir)/fb/fbcmap.c \
@@ -275,7 +275,7 @@ install-data-hook: $(HOOK_TARGETS)
 
 xquartz-install-hook:
 	mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin
-        cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
+	cd apple && xcodebuild install
 
 EXTRA_DIST = \
 	darwin.c \