diff options
| author | Andreas Fritiofson <andreas.fritiofson@gmail.com> | 2013-07-27 17:27:01 +0200 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-12-22 20:24:13 +0000 |
| commit | 619b8383e9cf31159c16825206a5da7154451494 (patch) | |
| tree | 74d0ad302d381324b270778d9b0dc839ba4b9f33 /common.mk | |
| parent | 6018406c78d19d19f875973f598929546aaa3608 (diff) | |
| download | riscv-openocd-619b8383e9cf31159c16825206a5da7154451494.zip riscv-openocd-619b8383e9cf31159c16825206a5da7154451494.tar.gz riscv-openocd-619b8383e9cf31159c16825206a5da7154451494.tar.bz2 | |
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>
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/helper \ -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DPKGLIBDIR=\"$(pkglibdir)\" + -DBINDIR=\"$(bindir)\" if INTERNAL_JIMTCL AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ |