]> git.sur5r.net Git - openocd/commit
Remove special handling of script search path on Windows
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sat, 27 Jul 2013 15:27:01 +0000 (17:27 +0200)
committerSpencer Oliver <spen@spen-soft.co.uk>
Sun, 22 Dec 2013 20:24:13 +0000 (20:24 +0000)
commit619b8383e9cf31159c16825206a5da7154451494
tree74d0ad302d381324b270778d9b0dc839ba4b9f33
parent6018406c78d19d19f875973f598929546aaa3608
Remove special handling of script search path on Windows

On all platforms, search for scripts in
$HOME/.openocd
${run_prefix}${pkgdatadir}/site
${run_prefix}${pkgdatadir}/scripts

On Windows, set run_prefix to the runtime path of the executable, minus
${bindir}. This is to enable the install dir to be moved anywhere, as long
as the structure of the install dir is kept intact. On all other platforms,
run_prefix is empty.

The script paths can now be adjusted on Windows builds the normal way; by
overriding pkgdatadir at build time. For example, to create a Windows
package layout of

bin/openocd.exe
scripts/interface/...
scripts/target/...

you can do
configure --prefix= --enable-... and then
make pkgdatadir= DESTDIR=/some/path clean all install

Also, remove the unused PKGLIBDIR define.

Change-Id: If2c8228fc80c598d763efad21c5f51695ff9b6cf
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1796
Tested-by: jenkins
Reviewed-by: Jens Bauer <jens@gpio.dk>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
common.mk
src/helper/options.c