# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1457556066 -7200
# Node ID 695d01a321ec448b6028fa0302d3c03bba8a80f1
# Parent  0fa142c7b5ac221195b0d62fb42858423f7b4eab
Fix maps build process to match with new Maputils.

diff -r 0fa142c7b5ac -r 695d01a321ec tools/makegmaps.php
--- a/tools/makegmaps.php	Wed Feb 10 16:57:13 2016 +0200
+++ b/tools/makegmaps.php	Wed Mar 09 22:41:06 2016 +0200
@@ -292,8 +292,8 @@
   stQueryConfigItems(1);
   stQueryConfigItems(2);
 
-  $cfg["pathRawMaps"] = $cfg["pathMapUtils"]."maps/";
-  $cfg["pathLocFiles"] = $cfg["pathMapUtils"]."maps/";
+  $cfg["pathRawMaps"] = $cfg["pathMapUtils"]."world/";
+  $cfg["pathLocFiles"] = $cfg["pathMapUtils"]."world/";
   $cfg["worldConfig"] = $cfg["pathMapUtils"]."www/world.inc.php";
 
   stQueryConfigItems(3);
@@ -317,7 +317,8 @@
 $worldJS = $cfg["pathGMap"]."world.js";
 $tradelaneOut = $cfg["pathGMap"]."tradelane.json";
 $tradelaneOverlay = $cfg["pathGMap"]."trlines.json";
-$binMkLoc = $cfg["pathMapUtils"]."mkloc";
+$tgtMkLoc = "bin/mkloc";
+$binMkLoc = $cfg["pathMapUtils"].$tgtMkLoc;
 $rawSuffix = ".new";
 $rawAltSuffix = ".map";
 
@@ -364,7 +365,7 @@
   passthru($tmp) == 0 or die("Error executing: ".$tmp."\n");
 }
 
-$tmp = "cd ".escapeshellarg($cfg["pathMapUtils"])." && ".$cfg["binMake"]." ".escapeshellarg(basename($binMkLoc));
+$tmp = "cd ".escapeshellarg($cfg["pathMapUtils"])." && ".$cfg["binMake"]." ".escapeshellarg($tgtMkLoc);
 echo "* $tmp\n";
 passthru($tmp) == 0 or die("Error executing: ".$tmp."\n");