Fix:Core:Removed some hardcoded paths, correct path for windres

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

diff --git a/navit/Makefile.am b/navit/Makefile.am
index 73d5ac8..cc305fc 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -52,8 +52,8 @@ if SUPPORT_WIN32
   navit_LDADD += resource.rsc
   navit_LDADD += -lcommctrl
 
-resource.rsc: $(top_builddir)/navit/gui/win32/resources/resource.rc
-       $(WINDRES) $(top_builddir)/navit/gui/win32/resources/resource.rc resource.rsc
+resource.rsc: $(top_srcdir)/navit/gui/win32/resources/resource.rc
+       $(WINDRES) -I $(top_srcdir)/navit/gui/win32/resources $(top_srcdir)/navit/gui/win32/resources/resource.rc resource.rsc
 endif
 
 .PHONY: version.h.tmp

diff --git a/navit/start.c b/navit/start.c
index 26925d0..129cf07 100644 (file)
--- a/navit/start.c
+++ b/navit/start.c
@@ -85,7 +85,7 @@ static void setup_dummy_environment(void)
                else
                        sprintf(basedir, ".");
        } else {
-               sprintf(basedir, "%s", "/Storage Card/navit");
+               sprintf(basedir, "%s", PREFIX);
        }
        sprintf(buf, "%s", basedir);
        setenv("HOME", buf, 0);
@@ -202,9 +202,6 @@ int main(int argc, char **argv)
 #ifdef HAVE_GLIB
        event_request_system("glib","start");
 #endif
-#ifdef HAVE_API_WIN32_CE
-       config_file="\\Storage Card\\navit.xml";
-#endif
        if (!config_load(config_file, &error)) {
                dbg(0, _("Error parsing '%s': %s\n"), config_file, error ? error->message : "");
        } else {