Search path fixes for MinGW builds. Courtesy of Dimitar Dimitrov <dinuxbg@gmail...

git-svn-id: svn://svn.berlios.de/openocd/trunk@1358 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/helper/options.c b/src/helper/options.c
index dd9f71387a79733b2c39275e8f5b716264d4c672..7e738d734042219b7d166536b3012b1bf5926dcd 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -80,6 +80,28 @@ int add_default_dirs(void)
                strcat(strExePath, "\\..");
                add_script_search_dir(strExePath);
        }
+       /*
+        * Add support for the default (as of 20080121) layout when
+        * using autotools and cygwin to build native MinGW binary.
+        * Path separator is converted to UNIX style so that MinGW is
+        * pleased.
+        *
+        * bin/openocd.exe
+        * lib/openocd/event/at91eb40a_reset.cfg
+        * lib/openocd/target/at91eb40a.cfg
+        */
+       {
+               char strExePath [MAX_PATH];
+               char *p;
+               GetModuleFileName (NULL, strExePath, MAX_PATH);
+               *strrchr(strExePath, '\\')=0;
+               strcat(strExePath, "/../lib/"PACKAGE);
+               for(p=strExePath; *p; p++) {
+                       if(*p == '\\')
+                               *p = '/';
+               }
+               add_script_search_dir(strExePath);
+       }
 #else
        /* Add dir for openocd supplied scripts last so that user can over
           ride those scripts if desired. */