From 4f310aa0c962930eec7bfb22aface78f8dd91bb9 Mon Sep 17 00:00:00 2001 From: Andreas Fritiofson Date: Sat, 21 Nov 2009 16:53:31 +0100 Subject: [PATCH] update win32 script search path The default script search path on Windows is out of date with the current layout (from installation and documentation), which makes the standard script library not be found after a normal ./configure && make && make install under msys/MinGW. The same should hold true for cygwin native builds (not verified). Update search path to ../share/openocd/scripts not ../lib/openocd, relative to the openocd executable. Signed-off-by: Andreas Fritiofson Signed-off-by: David Brownell --- src/helper/options.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/helper/options.c b/src/helper/options.c index 573026a6e..63c5b0575 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -74,21 +74,21 @@ static void add_default_dirs(void) add_script_search_dir(strExePath); } /* - * Add support for the default (as of 20080121) layout when - * using autotools and cygwin to build native MinGW binary. + * Add support for the default (as of 20091118) layout when + * using autotools and cygwin/MinGW to build native 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 + * share/openocd/scripts/interface/dummy.cfg + * share/openocd/scripts/target/at91eb40a.cfg */ { char strExePath [MAX_PATH]; char *p; GetModuleFileName (NULL, strExePath, MAX_PATH); *strrchr(strExePath, '\\') = 0; - strcat(strExePath, "/../lib/"PACKAGE); + strcat(strExePath, "/../share/"PACKAGE"/scripts"); for (p = strExePath; *p; p++) { if (*p == '\\') *p = '/';