Description: Rename router binaries
Author: Thibaut Gridel <tgridel@free.fr>
Forwarded: not-needed

--- a/src/Makefile
+++ b/src/Makefile
@@ -33,9 +33,9 @@ DEPDIR=.deps
 C=$(wildcard *.c)
 D=$(wildcard $(DEPDIR)/*.d)
 
-EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) \
+EXE=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) \
     filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
-    router+lib$(.EXE) router+lib-slim$(.EXE)
+    routino-router+lib$(.EXE) routino-router+lib-slim$(.EXE)
 
 ifneq ($(HOST),MINGW)
 LIB =libroutino.so               libroutino-slim.so
@@ -116,7 +116,7 @@ ifeq ($(HOST),MINGW)
 ROUTER_OBJ+=mman-win32.o
 endif
 
-router$(.EXE) : $(ROUTER_OBJ)
+routino-router$(.EXE) : $(ROUTER_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS)
 
 ########
@@ -131,7 +131,7 @@ ifeq ($(HOST),MINGW)
 ROUTER_SLIM_OBJ+=mman-win32.o
 endif
 
-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
+routino-router-slim$(.EXE) : $(ROUTER_SLIM_OBJ)
 	$(LD) $^ -o $@ $(LDFLAGS)
 
 ########
@@ -188,10 +188,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
 
 ROUTER_LIB_OBJ=router+lib.o
 
-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
+routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
 
-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
+routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
 
 ########
--- a/web/Makefile
+++ b/web/Makefile
@@ -52,7 +52,7 @@ TRANS_FILES=$(wildcard $(WEBTRANSDIR)/tr
 
 DOC_FILES=$(notdir $(wildcard $(DOCDIR)/html/*.html)) $(notdir $(wildcard $(DOCDIR)/html/*.css))
 
-EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) router$(.EXE) router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
+EXE_FILES=planetsplitter$(.EXE) planetsplitter-slim$(.EXE) routino-router$(.EXE) routino-router-slim$(.EXE) filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE)
 
 ########
 
--- a/src/test/a-b-c.sh
+++ b/src/test/a-b-c.sh
@@ -105,8 +105,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c >> $log
 
     mv shortest* $dir/$name-$waypoint
 
--- a/src/test/a-b.sh
+++ b/src/test/a-b.sh
@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b >> $log
 
     mv shortest* $dir/$name-$waypoint
 
--- a/src/test/a-b-c-d.sh
+++ b/src/test/a-b-c-d.sh
@@ -106,8 +106,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_a $waypoint_b $waypoint_c $waypoint_d >> $log
 
     mv shortest* $dir/$name-$waypoint
 
--- a/src/test/cycle-drive.sh
+++ b/src/test/cycle-drive.sh
@@ -106,8 +106,8 @@ for profile in $profiles; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router --profile=$profile $waypoint_start $waypoint_finish >> $log
 
     mv shortest* $dir/$name-$waypoint
 
--- a/src/test/start-1-finish.sh
+++ b/src/test/start-1-finish.sh
@@ -104,8 +104,8 @@ for waypoint in $waypoints; do
 
     [ -d $dir/$name-$waypoint ] || mkdir $dir/$name-$waypoint
 
-    echo ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
-    $debugger ../router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+    echo ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
+    $debugger ../routino-router$lib$slim $option_dir $option_prefix $option_osm $option_router $waypoint_start $waypoint_test $waypoint_finish >> $log
 
     mv shortest* $dir/$name-$waypoint
 
--- a/web/www/routino/paths.pl
+++ b/web/www/routino/paths.pl
@@ -33,7 +33,7 @@ $results_dir="$root_dir/results";
 $data_prefix="";
 
 # EDIT THIS to change the names of the executables (enables easy selection of slim mode).
-$router_exe="router";
+$router_exe="routino-router";
 $filedumper_exe="filedumper";
 
 # EDIT THIS to change the search type and base URL (must be a type recognised by search.pl).
