Fix:Core:Find libraries when compiled with --libdir=prefix/lib64

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1901 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/Makefile.am b/navit/navit/Makefile.am
index 1578442..51da9f5 100644 (file)
--- a/navit/navit/Makefile.am
+++ b/navit/navit/Makefile.am
@@ -5,7 +5,7 @@ if BUILD_SAMPLEMAP
   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)

diff --git a/navit/navit/main.c b/navit/navit/main.c
index 18499a6..e7748ee 100644 (file)
--- a/navit/navit/main.c
+++ b/navit/navit/main.c
@@ -175,7 +175,7 @@ setenv(char *var, char *val, int overwrite)
 #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"},
@@ -194,7 +194,10 @@ main_setup_environment(int mode)
                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);