# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1423428160 -7200
# Node ID d470c910cffaf9cecd90622e807ffc5fdc36d007
# Parent  9d048902f06b83d3032feb207b02f79b6bd433fd
Fix commandline parameters for main map builds.

diff -r 9d048902f06b -r d470c910cffa maps/Makefile.inc
--- a/maps/Makefile.inc	Sun Feb 08 22:15:15 2015 +0200
+++ b/maps/Makefile.inc	Sun Feb 08 22:42:40 2015 +0200
@@ -11,21 +11,21 @@
 	$(MKLOC_BIN) -v -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
 
 %.tmp2: %.map %.loc
-	$(MKLOC_BIN) -vN -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
+	$(MKLOC_BIN) -v -N -o $@ -m $< -l $(patsubst %.map,%.loc,$<)
 
 %.tmp3: %.loc
-	$(MKLOC_BIN) -vM -l $< -o $@
+	$(MKLOC_BIN) -v -M -l $< -o $@
 
 %.html: %.tmp %.desc
-	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -aC -f xhtml -o $@ $<
+	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -a -C -f xhtml -o $@ $<
 
 %.htm: %.tmp2 %.desc %.tmp3
-	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp2,%.desc,$<)`" -aCP -f xhtml $< | \
+	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp2,%.desc,$<)`" -a -C -P -f xhtml $< | \
 	sed -e "/@LOCATIONS@/r $(patsubst %.tmp2,%.tmp3,$<)" -e "s/@LOCATIONS@//g" > $@
 
 
 %.ansi: %.tmp %.desc
-	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -aC -f ansi -o $@ $<
+	$(COLORMAP_BIN) $(COLORMAP_OPTS) $(EXTRAOPTS) -t "`cat $(patsubst %.tmp,%.desc,$<)`" -a -C -f ansi -o $@ $<
 
 %.script: %.map %.loc
 	$(MKLOC_BIN) -S -m $< -l $(patsubst %.map,%.loc,$<) -f $(FONTSCALE) -u $(UNITSIZE) -s $(MAPSCALE) | \