[generator] User only --make_new_routing for the new routing

2 files changed, 4 insertions, 3 deletions

diff --git a/tools/unix/generate_planet.sh b/tools/unix/generate_planet.sh
index 1ae31088bc..373c852bef 100755
--- a/tools/unix/generate_planet.sh
+++ b/tools/unix/generate_planet.sh
@@ -427,7 +427,7 @@ if [ "$MODE" == "features" ]; then
   # Checking for coastlines, can't build proper mwms without them
   if [ ! -s "$INTDIR/WorldCoasts.geom" ]; then
     COASTS="${COASTS-WorldCoasts.geom}"
-    if [ ! -s "$COASTS" -a -n "${OLD_INTDIR-}" -a -s "$OLD_INTDIR/WorldCoasts.geom" ]; then
+    if [ ! -s "$COASTS" -a -n "${OLD_INTDIR-}" -a -s "${OLD_INTDIR-}/WorldCoasts.geom" ]; then
       log "Using older coastlines."
       COASTS="$OLD_INTDIR/WorldCoasts.geom"
     fi
diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh
index a85a442ce1..f63088cb1d 100755
--- a/tools/unix/generate_planet_routing.sh
+++ b/tools/unix/generate_planet_routing.sh
@@ -113,13 +113,14 @@ elif [ "$1" == "mwm" ]; then
 
   # Xargs has 255 chars limit for exec string, so we use short variable names.
   export G="$GENERATOR_TOOL"
-  export K="--make_routing --make_cross_section"
+  export K="--make_routing --make_cross_section --make_routing_index"
+  export I="--intermediate_data_path=$INTDIR"
   export TARGET
   export LOG_PATH
   export DATA_PATH
   set +e
   find "$INTDIR" -maxdepth 1 -name '*.osrm' -print0 | xargs -0 -P $NUM_PROCESSES -I % \
-    sh -c 'O="%"; B="$(basename "$O" .osrm)"; "$G" $K --osrm_file_name="$O" --data_path="$TARGET" --user_resource_path="$DATA_PATH" --output="$B" 2>> "$LOG_PATH/$B.log"'
+    sh -c 'O="%"; B="$(basename "$O" .osrm)"; "$G" $K "$I" --osrm_file_name="$O" --data_path="$TARGET" --user_resource_path="$DATA_PATH" --output="$B" 2>> "$LOG_PATH/$B.log"'
   set -e
 
   if [ -n "${POLY_DIR-}" ]; then