Moved rule to create DESTDIR to makefile.after

35 files changed, 6 insertions, 83 deletions

diff --git a/makefile.after b/makefile.after
index ea6c5191f..49797e51c 100644
--- a/makefile.after
+++ b/makefile.after
@@ -87,7 +87,12 @@ $(x11thislocaledir)\%: %.pre
 	cl /nologo /EP $< -DXCOMM\#\# > $@

 

 $(x11thislocaledir):

-	if not exist $(x11thislocaledir) mkdir $(x11thislocaledir)

+	$(CREATEDIR)

 

 all: $(x11thislocaledir)

 endif

+

+ifdef DESTDIR

+$(DESTDIR):

+	$(CREATEDIR)

+endif
\ No newline at end of file
diff --git a/xorg-server/fonts.src/100dpi/makefile b/xorg-server/fonts.src/100dpi/makefile
index 9514c7fc5..24057f7e6 100644
--- a/xorg-server/fonts.src/100dpi/makefile
+++ b/xorg-server/fonts.src/100dpi/makefile
@@ -7,8 +7,6 @@ INC_BDF_RULES=1
 all: $(BDFTOPCF)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\100dpi
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 BDF2UCS_FONT_FILES = \
 	lutBS08 \
diff --git a/xorg-server/fonts.src/75dpi/makefile b/xorg-server/fonts.src/75dpi/makefile
index 5c613afd5..e5c8002f0 100644
--- a/xorg-server/fonts.src/75dpi/makefile
+++ b/xorg-server/fonts.src/75dpi/makefile
@@ -7,8 +7,6 @@ INC_BDF_RULES=1
 all: $(BDFTOPCF)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\75dpi
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 BDF2UCS_FONT_FILES = \
 	lutBS08 \
diff --git a/xorg-server/fonts.src/OTF/makefile b/xorg-server/fonts.src/OTF/makefile
index 29df33564..e15018a64 100644
--- a/xorg-server/fonts.src/OTF/makefile
+++ b/xorg-server/fonts.src/OTF/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\OTF
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 FONT_FILES = \
 	SyrCOMAdiabene.otf \
diff --git a/xorg-server/fonts.src/Speedo/makefile b/xorg-server/fonts.src/Speedo/makefile
index b6de2deef..87f66559a 100644
--- a/xorg-server/fonts.src/Speedo/makefile
+++ b/xorg-server/fonts.src/Speedo/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Speedo
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 FONT_FILES = \
 	font0419.spd \
diff --git a/xorg-server/fonts.src/TTF/makefile b/xorg-server/fonts.src/TTF/makefile
index 0863f8b08..39b753ab1 100644
--- a/xorg-server/fonts.src/TTF/makefile
+++ b/xorg-server/fonts.src/TTF/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\TTF
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 
 FONT_FILES = \
diff --git a/xorg-server/fonts.src/Type1/makefile b/xorg-server/fonts.src/Type1/makefile
index 66e0d008d..bc2b6b06f 100644
--- a/xorg-server/fonts.src/Type1/makefile
+++ b/xorg-server/fonts.src/Type1/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Type1
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 FONT_FILES = \
 	cursor.pfa \
diff --git a/xorg-server/fonts.src/cyrillic/makefile b/xorg-server/fonts.src/cyrillic/makefile
index 2f0a063f3..47a455a17 100644
--- a/xorg-server/fonts.src/cyrillic/makefile
+++ b/xorg-server/fonts.src/cyrillic/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\cyrillic
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 FONT_FILES = \
 	proof9x16 \
diff --git a/xorg-server/fonts.src/encodings/large/makefile b/xorg-server/fonts.src/encodings/large/makefile
index 9701bfd39..0f168d046 100644
--- a/xorg-server/fonts.src/encodings/large/makefile
+++ b/xorg-server/fonts.src/encodings/large/makefile
@@ -5,8 +5,6 @@ endif
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings\large
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 ENCODING_FILES =		\
 	big5.eten-0.enc		\
diff --git a/xorg-server/fonts.src/encodings/makefile b/xorg-server/fonts.src/encodings/makefile
index 309583614..548d56ce5 100644
--- a/xorg-server/fonts.src/encodings/makefile
+++ b/xorg-server/fonts.src/encodings/makefile
@@ -6,8 +6,6 @@ load_makefile large\makefile MAKESERVER=0 DEBUG=0
 INC_BDF_RULES=1
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\encodings
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 ENCODING_FILES =		\
 	adobe-dingbats.enc	\
diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile
index f9c615c65..290ae173a 100644
--- a/xorg-server/fonts.src/misc/makefile
+++ b/xorg-server/fonts.src/misc/makefile
@@ -7,8 +7,6 @@ INC_BDF_RULES=1
 all: $(BDFTOPCF)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\misc
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 BDF2UCS_FONT_FILES = \
 	clR6x12 \
diff --git a/xorg-server/xkbdata.src/compat/makefile b/xorg-server/xkbdata.src/compat/makefile
index 729d5b3b3..486ca5541 100644
--- a/xorg-server/xkbdata.src/compat/makefile
+++ b/xorg-server/xkbdata.src/compat/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=compat
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 dist_xkbdata_compat_DATA = \
 accessx basic complete \
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/makefile b/xorg-server/xkbdata.src/geometry/digital_vndr/makefile
index 2137e8bf4..12d4c37fc 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/makefile
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/makefile
@@ -3,8 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\digital_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 dist_geom_DATA = \
 lk  pc  unix
diff --git a/xorg-server/xkbdata.src/geometry/makefile b/xorg-server/xkbdata.src/geometry/makefile
index ac936737d..e4351158f 100644
--- a/xorg-server/xkbdata.src/geometry/makefile
+++ b/xorg-server/xkbdata.src/geometry/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=geometry
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 dist_xkbdata_geometry_DATA = \
 amiga ataritt chicony \
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile b/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile
index 9d6380343..285067802 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/makefile
@@ -3,8 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\geometry\sgi_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 
 dist_geom_DATA = \
diff --git a/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile b/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile
index a39b83aa2..9cf1180e5 100644
--- a/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile
+++ b/xorg-server/xkbdata.src/keycodes/digital_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\digital_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_keycodes_DATA = \
 lk pc
diff --git a/xorg-server/xkbdata.src/keycodes/makefile b/xorg-server/xkbdata.src/keycodes/makefile
index bf48f22ef..4b127c396 100644
--- a/xorg-server/xkbdata.src/keycodes/makefile
+++ b/xorg-server/xkbdata.src/keycodes/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=keycodes
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 SUBDIRS = digital_vndr sgi_vndr
 
diff --git a/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile b/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile
index 6c4251ec1..e6c1defda 100644
--- a/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile
+++ b/xorg-server/xkbdata.src/keycodes/sgi_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keycodes\sgi_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_keycodes_DATA = \
 indigo indy iris
diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/makefile b/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
index 25750c711..09dd6f797 100644
--- a/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
+++ b/xorg-server/xkbdata.src/keymap/digital_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\digital_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_keymap_DATA = \
 us
diff --git a/xorg-server/xkbdata.src/keymap/makefile b/xorg-server/xkbdata.src/keymap/makefile
index 888dae43a..5e174d61e 100644
--- a/xorg-server/xkbdata.src/keymap/makefile
+++ b/xorg-server/xkbdata.src/keymap/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=keymap
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 SUBDIRS = digital_vndr sgi_vndr sun_vndr
 
diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
index e424b3f54..d2cb6083e 100644
--- a/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
+++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sgi_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_keymap_DATA = \
 be bg ca \
diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
index 640bcd881..1a3996406 100644
--- a/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
+++ b/xorg-server/xkbdata.src/keymap/sun_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\keymap\sun_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_keymap_DATA = \
 all de es fi \
diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile
index 201467cbf..1bd5e839b 100644
--- a/xorg-server/xkbdata.src/rules/makefile
+++ b/xorg-server/xkbdata.src/rules/makefile
@@ -5,8 +5,6 @@ endif
 load_makefile compat\makefile DEBUG=$(DEBUG)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
 HDR base.m_k.part \
diff --git a/xorg-server/xkbdata.src/semantics/makefile b/xorg-server/xkbdata.src/semantics/makefile
index 806ca60f4..0181c169f 100644
--- a/xorg-server/xkbdata.src/semantics/makefile
+++ b/xorg-server/xkbdata.src/semantics/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=semantics
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 dist_xkbdata_semantics_DATA = \
 	basic \
diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/makefile b/xorg-server/xkbdata.src/symbols/digital_vndr/makefile
index 6cff8ef1c..cdfa2ef28 100644
--- a/xorg-server/xkbdata.src/symbols/digital_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/digital_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\digital_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 lk pc us \
diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile
index c068650f1..841c123d8 100644
--- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\fujitsu_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 jp us
diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/makefile b/xorg-server/xkbdata.src/symbols/hp_vndr/makefile
index d5fbe59d3..3e6a64f47 100644
--- a/xorg-server/xkbdata.src/symbols/hp_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/hp_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\hp_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 us
diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
index 3150831dc..542b7a665 100644
--- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\macintosh_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 apple ch de dk \
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
index d6762e1ae..3b68b5c7a 100644
--- a/xorg-server/xkbdata.src/symbols/makefile
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=symbols
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/makefile b/xorg-server/xkbdata.src/symbols/nec_vndr/makefile
index 40782ce04..6ab523a2b 100644
--- a/xorg-server/xkbdata.src/symbols/nec_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/nec_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\nec_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 jp
diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile b/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile
index 84e299514..79a27fead 100644
--- a/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sgi_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 jp
diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/makefile b/xorg-server/xkbdata.src/symbols/sony_vndr/makefile
index 0827ecb0e..c2c1fa757 100644
--- a/xorg-server/xkbdata.src/symbols/sony_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/sony_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sony_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 us
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/makefile b/xorg-server/xkbdata.src/symbols/sun_vndr/makefile
index 122c1c376..5741501b3 100644
--- a/xorg-server/xkbdata.src/symbols/sun_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/sun_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\sun_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
  cs cz de dk es \
diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile b/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile
index 20c3d18f2..c9c1b3ede 100644
--- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile
+++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/makefile
@@ -3,9 +3,6 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\symbols\xfree68_vndr
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
-
 
 dist_symbols_DATA = \
 amiga ataritt
diff --git a/xorg-server/xkbdata.src/types/makefile b/xorg-server/xkbdata.src/types/makefile
index 33257a981..cef304543 100644
--- a/xorg-server/xkbdata.src/types/makefile
+++ b/xorg-server/xkbdata.src/types/makefile
@@ -5,8 +5,6 @@ endif
 THISDIR=types
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
-$(DESTDIR):
-	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
 dist_xkbdata_types_DATA = \
 	basic \