5 files changed, 25 insertions, 2 deletions
diff --git a/libX11/nls/C/makefile b/libX11/nls/C/makefile
new file mode 100644
index 000000000..69d26a1fe
--- /dev/null
+++ b/libX11/nls/C/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\C
+
+all: $(x11thislocaledir)\XLC_LOCALE
diff --git a/libX11/nls/iso8859-1/makefile b/libX11/nls/iso8859-1/makefile
new file mode 100644
index 000000000..48781d810
--- /dev/null
+++ b/libX11/nls/iso8859-1/makefile
@@ -0,0 +1,6 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-1
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
+
diff --git a/libX11/nls/makefile b/libX11/nls/makefile
new file mode 100644
index 000000000..19bf45e7a
--- /dev/null
+++ b/libX11/nls/makefile
@@ -0,0 +1 @@
+SUBDIRS = C iso8859-1
diff --git a/makefile.after b/makefile.after
index aa67e4d33..3e3e9d370 100644
--- a/makefile.after
+++ b/makefile.after
@@ -69,10 +69,9 @@ $(OBJDIR)\%$(OBJEXT) : %.cc
 $(OBJDIR)\%.res : %.rc
 	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i "%") -Fo"$(relpath $@)" "$<"
 
-BDFTOPCF= $(MHMAKECONF)\bdftopcf\$(OBJDIR)\bdftopcf.exe
+ifdef INC_BDF_RULES
 load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-ifdef INC_BDF_RULES
 $(DESTDIR)\%.pcf.gz: %.bdf
 	@del -e $@
 	$(BDFTOPCF) -t $< | gzip > $@
@@ -81,3 +80,13 @@ $(DESTDIR)\%.enc.gz: %.enc
 	gzip -c < $< > $@
 endif
 
+ifdef x11thislocaledir
+
+$(x11thislocaledir)\%: %.pre
+	cl /nologo /EP $< -DXCOMM\#\# > $@
+
+$(x11thislocaledir):
+	if not exist $(x11thislocaledir) mkdir $(x11thislocaledir)
+
+all: $(x11thislocaledir)
+endif
diff --git a/makefile.before b/makefile.before
index c6946e762..948fbb0fc 100644
--- a/makefile.before
+++ b/makefile.before
@@ -60,5 +60,7 @@ SYSTEMLIBS ?= odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool
 
 CPPFLAGS ?= $(CCFLAGS) -EHa
 
+BDFTOPCF= $(MHMAKECONF)\bdftopcf\$(OBJDIR)\bdftopcf.exe
+
 all: $(OBJDIR)