Index: xc/lib/X11/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/Imakefile,v
retrieving revision 1.7
diff -u -r1.7 Imakefile
--- xc/lib/X11/Imakefile	1 Sep 2004 01:04:33 -0000	1.7
+++ xc/lib/X11/Imakefile	7 May 2005 01:08:58 -0000
@@ -137,7 +137,10 @@
 #if NeedLibInsideFlag
     LIB_DEFINES = -D_XLIBINT_
 #endif
-#if defined(LibDirName)
+#if defined(Xi18nLibDirName)
+        POSTLOCALELIBDIR = Xi18nLibDirName
+        POSTLOCALELIBDEFINES = -DPOSTLOCALELIBDIR=\"$(POSTLOCALELIBDIR)\"
+#elif defined(LibDirName)
         POSTLOCALELIBDIR = LibDirName
         POSTLOCALELIBDEFINES = -DPOSTLOCALELIBDIR=\"$(POSTLOCALELIBDIR)\"
 #endif
Index: xc/lib/X11/xlibi18n/Xi18nLib.conf
===================================================================
RCS file: /cvs/xorg/xc/lib/X11/xlibi18n/Xi18nLib.conf,v
retrieving revision 1.4
diff -u -r1.4 Xi18nLib.conf
--- xc/lib/X11/xlibi18n/Xi18nLib.conf	26 Aug 2004 17:57:19 -0000	1.4
+++ xc/lib/X11/xlibi18n/Xi18nLib.conf	7 May 2005 01:08:59 -0000
@@ -11,7 +11,9 @@
 
      SOXI18NREV = 2
      POSTLOCALE = common
-#if defined (LibDirName)
+#if defined (Xi18nLibDirName)
+     POSTLOCALELIB = Xi18nLibDirName
+#elif defined (LibDirName)
      POSTLOCALELIB = LibDirName
 #else
      POSTLOCALELIB = lib