File xorg7.diff of Package NX

diff -u -r nx-X11/lib/X11.orig/Imakefile nx-X11/lib/X11/Imakefile
--- nx-X11/lib/X11.orig/Imakefile	2006-08-11 23:02:44.000000000 +0200
+++ nx-X11/lib/X11/Imakefile	2006-08-11 23:06:22.000000000 +0200
@@ -144,8 +144,8 @@
 
     XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines
 
-     EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\"
-     KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\"
+     EDB_DEFINES = -DERRORDB=\"/usr/share/X11/XErrorDB\"
+     KDB_DEFINES = -DKEYSYMDB=\"/usr/share/X11//XKeysymDB\"
      CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\"
 #if HasSnprintf
     MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11
diff -u -r nx-X11/programs/Xserver.old/hw/xnest/Keyboard.c nx-X11/programs/Xserver/hw/xnest/Keyboard.c
--- nx-X11/programs/Xserver.old/hw/xnest/Keyboard.c	2006-12-18 16:09:03.000000000 +0100
+++ nx-X11/programs/Xserver/hw/xnest/Keyboard.c	2006-12-18 16:12:03.000000000 +0100
@@ -64,7 +64,7 @@
 );
 
 #ifndef XKB_BASE_DIRECTORY
-#define	XKB_BASE_DIRECTORY	"/usr/X11R6/lib/X11/xkb/"
+#define	XKB_BASE_DIRECTORY	"/usr/share/X11/xkb/"
 #endif
 #ifndef XKB_CONFIG_FILE
 #define	XKB_CONFIG_FILE		"X0-config.keyboard"
diff -u -r nx-X11/programs/Xserver.old/xkb/Imakefile nx-X11/programs/Xserver/xkb/Imakefile
--- nx-X11/programs/Xserver.old/xkb/Imakefile	2006-12-18 16:09:36.000000000 +0100
+++ nx-X11/programs/Xserver/xkb/Imakefile	2006-12-18 16:13:09.000000000 +0100
@@ -51,7 +51,7 @@
    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 
 DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) $(NX_DEFINES)
-XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE)
+XKB_DEFINES = $(XKB_DISABLE)
 
 NormalLibraryObjectRule()
 NormalLibraryTarget(xkb,$(OBJS))
--- nx-X11/programs/Xserver/xkb/xkbInit.c.orig
+++ nx-X11/programs/Xserver/xkb/xkbInit.c
@@ -98,7 +98,7 @@ typedef struct	_SrvXkmInfo {
 /***====================================================================***/
 
 #ifndef XKB_BASE_DIRECTORY
-#define	XKB_BASE_DIRECTORY	"/usr/lib/X11/xkb"
+#define	XKB_BASE_DIRECTORY	"/usr/share/X11/xkb"
 #endif
 #ifndef XKB_BIN_DIRECTORY
 #define	XKB_BIN_DIRECTORY	XKB_BASE_DIRECTORY