 +
 diff -Naur xc.orig/programs/Xserver/hw/xfree86/parser/Imakefile xc/programs/Xserver/hw/xfree86/parser/Imakefile
 --- xc.orig/programs/Xserver/hw/xfree86/parser/Imakefile	2006-03-11 18:15:38.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/parser/Imakefile	2006-03-11 16:09:00.000000000 +0100
++++ xc/programs/Xserver/hw/xfree86/parser/Imakefile	2006-03-19 09:41:00.000000000 +0100
 @@ -16,7 +16,12 @@
  DBMALLOCDEFINE=-DDBMALLOC
  #endif

+										
+					keySetString(modPath, buffer);
+				} else {
+					/* ModulePath exist, add this module path */
+					char *oldPath, *newPath;
+					
+					oldPath = keyStealValue(modPath);

 CONFIG_DEFINES = -DXCONFIGDIR=\"$(XCONFIGDIR)\" \
 		 -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
 		 -DXVERSION="$(XVERS)"
@@ -44,10 +54,15 @@
 #define IncludeSharedObjectInNormalLib
 
 #include <Library.tmpl>
-
+#ifdefined(UseElektra)
+SpecialCObjectRule(elektra,NullParameter,$(CONFIG_DEFINES) -DMODULE_DIR=\"$(MODULEDIR)\" $(EXT_DEFINES) $(PICFLAGS))
 SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS))
 
 NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
