xserver: Branch 'master'

[Jeremy Huddleston]

 hw/xquartz/bundle/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b95059c20746a71e60ef152bb627e1d5c2210d75
Author: Jeremy Huddleston <jeremy at tifa-2.local>
Date:   Sat Feb 16 01:33:13 2008 -0800

    Added Xquartz.plist to EXTRA_DIST
    (cherry picked from commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 093a102..801fdc7 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -15,6 +15,7 @@ resourcedir=$(libdir)/X11/xserver
 resource_DATA = Xquartz.plist
 
 EXTRA_DIST = \
+	$(resource_DATA) \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \