diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2018-08-31 16:48:47 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2018-08-31 16:48:47 +0200 |
| commit | b7c2c11d1073c3d3c611002c15e24c4d866ef39a (patch) | |
| tree | 0cd5bba553c4e32514d320239d48ed814f84a3b9 /src/navigation/build.sh | |
| parent | 9346ef5281125ab7ea81d8e4ec13e9b3ed1b427b (diff) | |
| download | poi-service-b7c2c11d1073c3d3c611002c15e24c4d866ef39a.tar.gz | |
Align with latest version of navit, fix some issues
Built with gcc 7.3.0, tested on Ubuntu 18.04
Diffstat (limited to 'src/navigation/build.sh')
| -rwxr-xr-x | src/navigation/build.sh | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/navigation/build.sh b/src/navigation/build.sh index f8daf55..c209855 100755 --- a/src/navigation/build.sh +++ b/src/navigation/build.sh @@ -40,17 +40,17 @@ speech_option="OFF" function check_path_for_capi { echo 'check path for CommonAPI' - if [ ! $COMMONAPI_TOOL_DIR ] + if [ ! $COMMONAPI_TOOL_GENERATOR ] then - echo 'Set the dir of the common api tools' - echo 'export COMMONAPI_TOOL_DIR=<path>' + echo 'Set the link to the common api generator' + echo 'export COMMONAPI_TOOL_GENERATOR=<tool>' exit 1 fi - if [ ! $COMMONAPI_DBUS_TOOL_DIR ] + if [ ! $COMMONAPI_DBUS_TOOL_GENERATOR ] then - echo 'Set the dir of the common api dbus tools' - echo 'export COMMONAPI_DBUS_TOOL_DIR=<path>' + echo 'Set the link to the common api dbus generator' + echo 'export COMMONAPI_DBUS_TOOL_GENERATOR=<tool>' exit 1 fi @@ -60,7 +60,8 @@ function check_path_for_capi echo 'export DBUS_LIB_PATH=<path>' exit 1 fi - commonapi_tools_option="-DWITH_PLUGIN_MIGRATION=ON -DWITH_DBUS_INTERFACE=OFF -DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR + + commonapi_tools_option="-DWITH_PLUGIN_MIGRATION=ON -DWITH_DBUS_INTERFACE=OFF -DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_GENERATOR="$COMMONAPI_DBUS_TOOL_GENERATOR" -DCOMMONAPI_TOOL_GENERATOR="$COMMONAPI_TOOL_GENERATOR } while getopts cdlmhnps opt |