alignment with navit git done, tested: route calculation and map viewer

5 files changed, 17 insertions, 19 deletions

diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index ebfe58c..538f3d1 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -47,12 +47,12 @@ find_program(XSLTPROC xsltproc REQUIRED)
 if(NOT ${YOCTO_CONFIG})
     execute_process(
         OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_mapviewer.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml
     )
 else()
     execute_process(
         OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/navit_genivi_mapviewer.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${NAVIT_CMAKE_DIR}/../navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_mapviewer.xsl ${NAVIT_CMAKE_DIR}/../navit/navit_shipped.xml
     )
 endif()
 
diff --git a/src/navigation/map-viewer/navit_genivi_mapviewer.xsl b/src/navigation/map-viewer/navit_genivi_mapviewer.xsl
index 9973ca2..a83d7fc 100644
--- a/src/navigation/map-viewer/navit_genivi_mapviewer.xsl
+++ b/src/navigation/map-viewer/navit_genivi_mapviewer.xsl
@@ -23,11 +23,11 @@
         <xsl:template match="/config/plugins/plugin[1]" priority="1" >
 		<xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../map-viewer/configuration-plugin/.libs/libgenivi_mapviewer_configuration.so" ondemand="no"/>
+		<plugin path="../../map-viewer/configuration-plugin/.libs/libgenivi_mapviewer_configuration.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../map-viewer/session-plugin/.libs/libgenivi_mapviewer_session.so" ondemand="no"/>
+		<plugin path="../../map-viewer/session-plugin/.libs/libgenivi_mapviewer_session.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../map-viewer/mapviewercontrol-plugin/.libs/libgenivi_mapviewer_mapviewercontrol.so" ondemand="no"/>
+		<plugin path="../../map-viewer/mapviewercontrol-plugin/.libs/libgenivi_mapviewer_mapviewercontrol.so" ondemand="no"/>
         </xsl:template>
         <xsl:template match="/config/plugins/plugin">
 		<xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index 8e29383..c9fad47 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -47,12 +47,12 @@ find_program(XSLTPROC xsltproc REQUIRED)
 if(NOT ${YOCTO_CONFIG})
     execute_process(
         OUTPUT_FILE ${NAVIT_BIN_DIR}/navit_genivi_navigationcore.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${navit_SOURCE_DIR}/navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${navit_SOURCE_DIR}/navit/navit_shipped.xml
     )
 else()
     execute_process(
         OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/navit_genivi_navigationcore.xml
-        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${NAVIT_CMAKE_DIR}/../navit_shipped.xml
+        COMMAND ${XSLTPROC} ${CMAKE_CURRENT_SOURCE_DIR}/navit_genivi_navigationcore.xsl ${NAVIT_CMAKE_DIR}/../navit/navit_shipped.xml
     )
 endif()
 
diff --git a/src/navigation/navigation-core/navit_genivi_navigationcore.xsl b/src/navigation/navigation-core/navit_genivi_navigationcore.xsl
index c736e6b..a0f2d61 100644
--- a/src/navigation/navigation-core/navit_genivi_navigationcore.xsl
+++ b/src/navigation/navigation-core/navit_genivi_navigationcore.xsl
@@ -23,21 +23,21 @@
         <xsl:template match="/config/plugins/plugin[1]" priority="1" >
 		<xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/configuration-plugin/.libs/libgenivi_navigationcore_configuration.so" ondemand="no"/>
+		<plugin path="../../navigation-core/configuration-plugin/.libs/libgenivi_navigationcore_configuration.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/locationinput-plugin/.libs/libgenivi_navigationcore_locationinput.so" ondemand="no"/>
+		<plugin path="../../navigation-core/locationinput-plugin/.libs/libgenivi_navigationcore_locationinput.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/routing-plugin/.libs/libgenivi_navigationcore_routing.so" ondemand="no"/>
+		<plugin path="../../navigation-core/routing-plugin/.libs/libgenivi_navigationcore_routing.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/session-plugin/.libs/libgenivi_navigationcore_session.so" ondemand="no"/>
+		<plugin path="../../navigation-core/session-plugin/.libs/libgenivi_navigationcore_session.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/guidance-plugin/.libs/libgenivi_navigationcore_guidance.so" ondemand="no"/>
+		<plugin path="../../navigation-core/guidance-plugin/.libs/libgenivi_navigationcore_guidance.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/mapmatchedposition-plugin/.libs/libgenivi_navigationcore_mapmatchedposition.so" ondemand="no"/>
+		<plugin path="../../navigation-core/mapmatchedposition-plugin/.libs/libgenivi_navigationcore_mapmatchedposition.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../navigation-core/enhancedposition-plugin/.libs/libgenivi_positioning_enhancedposition.so" ondemand="no"/>
+		<plugin path="../../navigation-core/enhancedposition-plugin/.libs/libgenivi_positioning_enhancedposition.so" ondemand="no"/>
 		<xsl:text>&#x0A;                </xsl:text>
-		<plugin path="../../../poi-cam/.libs/libgenivi_poiservice_cam_navit.so" ondemand="no"/>
+		<plugin path="../../poi-cam/.libs/libgenivi_poiservice_cam_navit.so" ondemand="no"/>
         </xsl:template>
         <xsl:template match="/config/plugins/plugin">
 		<xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
diff --git a/src/navigation/rebuild_all.sh b/src/navigation/rebuild_all.sh
index 06c2249..e91a68b 100755
--- a/src/navigation/rebuild_all.sh
+++ b/src/navigation/rebuild_all.sh
@@ -29,15 +29,13 @@ mkdir -p build
 cd build
 mkdir -p navit
 cd navit
-mkdir -p navit
-cd navit
 echo 'build navit'
 if [ "$clean" = 1 ]
 then
-	cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../../navit/navit/
+	cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/
 fi
 make
-cd ../../
+cd ../
 echo 'build navigation'
 if [ "$clean" = 1 ]
 then