1 diff -urp -x '*~' Xext/Makefile.am Xext/Makefile.am

     2 --- Xext/Makefile.am	2006-11-13 16:59:38.000000000 -0800

     3 +++ Xext/Makefile.am	2006-12-21 14:19:20.440059000 -0800

     4 @@ -34,7 +34,7 @@ MODULE_SRCS =			\

     5  	xcmisc.c

     6  

     7  # Extra configuration files ship with some extensions

     8 -SERVERCONFIGdir = $(libdir)/xserver

     9 +SERVERCONFIGdir = $(libdir)/X11/xserver

    10  SERVERCONFIG_DATA =

    11  

    12  # Optional sources included if extension enabled by configure.ac rules

    13 diff -urp -x '*~' xkb/Makefile.am xkb/Makefile.am

    14 --- xkb/Makefile.am	2006-11-13 16:59:41.000000000 -0800

    15 +++ xkb/Makefile.am	2006-12-21 14:19:20.503671000 -0800

    16 @@ -1,6 +1,7 @@

    17  noinst_LTLIBRARIES = libxkb.la libxkbstubs.la

    18  

    19  AM_CFLAGS = $(DIX_CFLAGS) \

    20 +	-DMAKE_XKM_OUTPUT_DIR \

    21  	-DHAVE_XKB_CONFIG_H

    22  

    23  DDX_SRCS = \

    24 diff -urp -x '*~' xkb/xkbInit.c xkb/xkbInit.c

    25 --- xkb/xkbInit.c	2006-11-13 16:59:41.000000000 -0800

    26 +++ xkb/xkbInit.c	2006-12-21 14:19:20.503312000 -0800

    27 @@ -123,7 +123,7 @@ typedef struct	_SrvXkmInfo {

    28  #endif

    29  

    30  char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;

    31 -char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;

    32 +char	*		XkbBinDirectory=	XKB_BASE_DIRECTORY;

    33  int	 		XkbWantAccessX=		0;	

    34  static XkbFileInfo *	_XkbInitFileInfo=	NULL;

    35