fixing the location of the 'xserver' dir

[paul ?]

it's not uniform amongst the makefiles
which can lead to increased Xprt headaches
these patches make the location uniform
if configured --prefix=/usr, it used to make the xserver dir both as 
/usr/lib/xserver and /usr/X11/xserver
now it's /usr/lib/X11/xserver


Index: xorg/Xext/Makefile.am
===================================================================
RCS file: /cvs/xorg/xserver/xorg/Xext/Makefile.am,v
retrieving revision 1.22
diff -u -d -b -w -r1.22 Makefile.am
--- xorg/Xext/Makefile.am       5 Apr 2006 21:08:45 -0000       1.22
+++ xorg/Xext/Makefile.am       19 May 2006 09:12:18 -0000
@@ -73,7 +73,7 @@
if XCSECURITY
BUILTIN_SRCS += $(XCSECURITY_SRCS)

-SERVERCONFIGdir = $(libdir)/xserver
+SERVERCONFIGdir = $(libdir)/X11/xserver
SERVERCONFIG_DATA = SecurityPolicy
AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
endif

Index: xorg/Xprint/Makefile.am
===================================================================
RCS file: /cvs/xorg/xserver/xorg/Xprint/Makefile.am,v
retrieving revision 1.9
diff -u -d -b -w -r1.9 Makefile.am
--- xorg/Xprint/Makefile.am     3 Apr 2006 21:45:54 -0000       1.9
+++ xorg/Xprint/Makefile.am     19 May 2006 09:12:18 -0000
@@ -4,7 +4,7 @@

Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
        -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_  \
-       -DXPRINTDIR=\"$(prefix)/X11/xserver\"    \
+       -DXPRINTDIR=\"$(libdir)/X11/xserver\"    \
        -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX

Xprt_LDFLAGS = -L$(top_srcdir)

_________________________________________________________________
Express yourself instantly with MSN Messenger! Download today - it's FREE! 
http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/