[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-124-g4f310aa

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  4f310aa0c962930eec7bfb22aface78f8dd91bb9 (commit)
      from  fb4239866c6a9aa429b58be7488a93ec1245597b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f310aa0c962930eec7bfb22aface78f8dd91bb9
Author: Andreas Fritiofson <and...@gm...>
Date:   Sat Nov 21 16:53:31 2009 +0100

    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 <and...@gm...>
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/src/helper/options.c b/src/helper/options.c
index 573026a..63c5b05 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 = '/';

-----------------------------------------------------------------------

Summary of changes:
 src/helper/options.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository