SUBDIRS += maps
endif
-AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=navit
+AM_CPPFLAGS = -I$(top_srcdir)/navit/fib-1.1 @NAVIT_CFLAGS@ @ZLIB_CFLAGS@ -DPREFIX=\"@prefix@\" -DLIBDIR=\"@libdir@\" -DMODULE=navit
BUILT_SOURCES = version.h
if BUILD_SAMPLEMAP
BUILT_SOURCES += osm2navit$(EXEEXT)
#endif
static char *environment_vars[][4]={
- {"NAVIT_LIBDIR", ":", ":/lib/navit", ":/lib"},
+ {"NAVIT_LIBDIR", ":", "::/navit", ":/lib"},
{"NAVIT_SHAREDIR", ":", ":/share/navit", ":"},
{"NAVIT_LOCALEDIR", ":/../locale", ":/share/locale", ":/locale"},
{"NAVIT_USER_DATADIR", ":", "~/.navit", ":/data"},
if (val) {
switch (val[0]) {
case ':':
- val=g_strdup_printf("%s%s", getenv("NAVIT_PREFIX"), val+1);
+ if (val[1] == ':')
+ val=g_strdup_printf("%s/%s%s", getenv("NAVIT_PREFIX"), LIBDIR+sizeof(PREFIX), val+2);
+ else
+ val=g_strdup_printf("%s%s", getenv("NAVIT_PREFIX"), val+1);
break;
case '~':
val=g_strdup_printf("%s%s", getenv("HOME"), val+1);