--- a/old/Makefile	Wed Oct 18 16:50:41 2017 +0300
+++ b/old/Makefile	Wed Oct 18 17:04:10 2017 +0300
@@ -21,12 +21,6 @@
 
 include $(MAP_PATH)Makefile.inc
 
-%.cmap: %.raw $(MKMAP_BIN)
-	$(MKMAP_BIN) -o $@ -r 10 -w 21 -h 21 $< -v -d -m 80
-
-%.map: %.raw $(MKMAP_BIN)
-	$(MKMAP_BIN) -o $@ -r 10 -w 13 -h 7 $< -v -d -m 70
-
 batmap.map: batmap-30-11-2006.txt
 	@ln -s $< $@
 
@@ -36,14 +30,14 @@
 MonospaceBold.ttf: $(MAP_PATH)MonospaceBold.ttf
 	@ln -s $< $@
 
-batcity.html: batcity.map batcity.loc tooltip.js
+batcity.html: batcity.map batcity.loc tooltip.js $(MKCITYMAP_BIN)
 	$(MKCITYMAP_BIN) $(MKCITYMAP_OPTS) -T -t "Old BatCity map" $< batcity.loc -o "$@"
 
-twomi-batmap.ansi: twomi-batmap.tmp
-	$(COLORMAP_BIN) $(COLORMAP_OPTS) -O -f ansi -t "`cat $(patsubst %.tmp,%.desc,$<)`" $< -o $@
+#twomi-batmap.ansi: twomi-batmap.tmp $(COLORMAP_BIN)
+#	$(COLORMAP_BIN) $(COLORMAP_OPTS) -O -f ansi -t "`cat $(patsubst %.tmp,%.desc,$<)`" $< -o $@
 
-twomi-batmap.html: twomi-batmap.tmp
-	$(COLORMAP_BIN) $(COLORMAP_OPTS) -O $(COLORMAP_HTML) -t "`cat $(patsubst %.tmp,%.desc,$<)`" $< -o $@
+#twomi-batmap.html: twomi-batmap.tmp $(COLORMAP_BIN)
+#	$(COLORMAP_BIN) $(COLORMAP_OPTS) -O $(COLORMAP_HTML) -t "`cat $(patsubst %.tmp,%.desc,$<)`" $< -o $@
 
 hcbat.loc: hcbat.ref $(MAP_PATH)laenor.loc $(MAP_PATH)desolathya.loc $(MAP_PATH)rothikgen.loc $(MAP_PATH)furnachia.loc $(MAP_PATH)lucentium.loc
 	perl -w ./mapref.pl $+ > $@

--- a/world/Makefile.inc	Wed Oct 18 16:50:41 2017 +0300
+++ b/world/Makefile.inc	Wed Oct 18 17:04:10 2017 +0300
@@ -14,23 +14,23 @@
 ###
 ### Intermediate file targets
 ###
-%.tmp: %.map %.loc
+%.tmp: %.map %.loc $(MKLOC_BIN)
 	$(MKLOC_BIN) -v -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
 
-%.tmp2: %.map %.loc
+%.tmp2: %.map %.loc $(MKLOC_BIN)
 	$(MKLOC_BIN) -v -N -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
 
-%.tmp3: %.loc
+%.tmp3: %.loc $(MKLOC_BIN)
 	$(MKLOC_BIN) -v -M -l $< -o $@
 
 ###
 ### HTML format maps
 ###
 
-%.htm: %.tmp %.desc
+%.htm: %.tmp %.desc $(COLORMAP_BIN)
 	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(COLORMAP_HTML) $(COLORMAP_EXTRA) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -o $@ $<
 
-%.html: %.tmp2 %.desc %.tmp3
+%.html: %.tmp2 %.desc %.tmp3 $(COLORMAP_BIN)
 	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(COLORMAP_HTML) -P $(COLORMAP_EXTRA) -t "`cat $(patsubst %.tmp2,%.desc,$<)`" $< | \
 	sed -e "/@LOCATIONS@/r $(patsubst %.tmp2,%.tmp3,$<)" -e "s/@LOCATIONS@//g" > $@
 
@@ -38,20 +38,20 @@
 ###
 ### ANSI text
 ###
-%.ansi: %.tmp %.desc
+%.ansi: %.tmp %.desc $(COLORMAP_BIN)
 	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(COLORMAP_EXTRA) -f ansi -t "`cat $(patsubst %.tmp,%.desc,$<)`" -o $@ $<
 
 
 ###
 ### PNG images
 ###
-%.script: %.map %.loc title.png $(MAP_FONT)
+%.script: %.map %.loc title.png $(MAP_FONT) $(MKLOC_BIN)
 	$(MKLOC_BIN) -S -m $< -l $(patsubst %.map,%.loc,$<) -f $(MAP_FONT_SCALE) -u $(MAP_UNIT_SIZE) -s $(MAP_SCALE) | \
 	sed -e "s/@OPTS_START@/-font $(MAP_FONT) -pointsize 14 -type TruecolorMatte/g" \
 	-e "s/@OPTS_END@/\t-geometry +0+0 title.png -composite -compose screen \\\\\n\t-pointsize 20 -fill white -box none -draw \"text 5,50 \'@PAF@\n\n\n/g" | \
 	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
 
-%.ppm: %.map
+%.ppm: %.map $(MAP2PPM_BIN)
 	$(MAP2PPM_BIN) -s $(MAP_SCALE) $(COLORMAP_EXTRA) $< -o $@
 
 %.png: %.ppm %.script %.desc