9 files changed, 23 insertions, 23 deletions
diff --git a/building.txt b/building.txt
index 38571bd0c..0ac937044 100644
--- a/building.txt
+++ b/building.txt
@@ -13,7 +13,7 @@ Building freetype:
 
 Building openssl:
 - run 'perl Configure VC-WIN32' in the openssl directory
-- run 'ms\do_masm.bat in the openssl' directory
+- run 'ms\do_masm.bat' in the openssl' directory
 - run 'nmake -f ms\nt.mak' in the openssl directory
 - run 'nmake DEBUG=1 -f ms\nt.mak' in the openssl directory (if you want to build the DEBUG version of vcxsrv)
 
@@ -25,6 +25,7 @@ Building pthreads:
 Building vcxsrv:
 - run 'mhmake MAKESERVER=1' in xorg-server directory
 - run 'mhmake DEBUG=1 MAKESERVER=1' in xorg-server directory for a debugable version
+- run 'mhmake' in bdftopcf
 - run 'mhame' in xorg-server\fonts.src to build the fonts directory
 - run 'mhmake' in xorg-server\xkbdata.src to build the keyboard data
 
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
index 934e0b571..6fc8f4713 100644
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
@@ -3,7 +3,7 @@ set variant=%1
 
 set OUTFILE=base.l%variant%_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
 gawk "{ if (index($2, """(""") == 0) { printf """  %%s		=	+%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;} else { printf """  %%s		=	+%%s:%variant%\n""", $1, $2; } }" layoutRename.lst >> %OUTFILE%
 
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
index 21de20529..a2b828803 100644
--- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
@@ -3,6 +3,6 @@ set variant=%1
 
 set OUTFILE=base.l%variant%v%variant%_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
-awk "{ printf """  %%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
+gawk "{ printf """  %%s		%%s	=	+%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
index b31eb2af9..dedccdb45 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
@@ -2,8 +2,8 @@
 
 set OUTFILE=base.ml1_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
-awk "{if (index($2, """(""") == 0) { printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """  *		%%s			=	pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE%
+gawk "{if (index($2, """(""") == 0) { printf """  *		%%s			=	pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """  *		%%s			=	pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE%
 
-awk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
+gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
index 4cc83e138..26de0ea38 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
@@ -2,6 +2,6 @@
 
 set OUTFILE=base.ml1v1_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
-awk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
index 02ae5726d..afd7d7b19 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
@@ -1,10 +1,7 @@
-#!/bin/sh
+@echo off
 
-INDIR=`dirname $0`
-OUTFILE=base.ml1v_s.part
+set OUTFILE=base.ml1v_s.part
 
-> $OUTFILE
+if exist %OUTFILE% del %OUTFILE%
 
-awk '{ 
-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
-}' < $INDIR/variantRename.lst >> $OUTFILE
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
index 9b41b9a7c..c0b945a26 100644
--- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
@@ -2,8 +2,8 @@
 
 set OUTFILE=base.ml_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
-awk "{ printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
+gawk "{ printf """  *		%%s			=	pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE%
 
-awk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE%
+gawk "{ printf """  *		%%s(%%s)			=	pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE%
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
index 4d59fef67..4dbe7acb3 100644
--- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
+++ b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
@@ -2,7 +2,7 @@
 
 set OUTFILE=base.mlv_s.part
 
-del %OUTFILE%
+if exist %OUTFILE% del %OUTFILE%
 
-awk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
+gawk "{ printf """  *		%%s		%%s		=	pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE%
 
diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile
index 06a6d15c5..201467cbf 100644
--- a/xorg-server/xkbdata.src/rules/makefile
+++ b/xorg-server/xkbdata.src/rules/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+load_makefile compat\makefile DEBUG=$(DEBUG)
+
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -127,10 +129,10 @@ LST_FILES = base.lst evdev.lst
 $(DESTDIR)\%.lst: $(DESTDIR)\%.xml
 	perl xml2lst.pl < $< > $@
 
-$(DESTDIR)\base: $(BASE_PARTS_NO_COMPAT)
+$(DESTDIR)\base: compat\all $(BASE_PARTS_NO_COMPAT)
 	merge $@ $(BASE_PARTS)
 
-$(DESTDIR)\evdev: $(EVDEV_PARTS_NO_COMPAT)
+$(DESTDIR)\evdev: compat\all $(EVDEV_PARTS_NO_COMPAT)
 	merge $@ $(EVDEV_PARTS) 
 
 ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \