diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-27 07:49:58 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-27 07:49:58 +0000 |
| commit | dd86b54e6e03a0682eb8ed41006ffdfd837ffae0 (patch) | |
| tree | fcd056391c8d98cad8823a9dbb0576c1e373dabe /src/helper | |
| parent | dbbc9c41f7db210b0a4e226540a28e0a8a5019bf (diff) | |
| download | riscv-openocd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.zip riscv-openocd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.tar.gz riscv-openocd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.tar.bz2 | |
Update build system to find moved scripts -- Step 3 of 2:
- Update references from using PKGLIBDIR to PKGDATADIR.
- Update built-in script search paths to reflect new install location:
- $(pkgdatadir) => $(pktdatadir)/site
- $(pkglibdir) => $(pktdatadir)/scripts
- Update installed location of httpd files:
- $(pkglibdir)/httpd => $(pkgdatadir)/httpd
git-svn-id: svn://svn.berlios.de/openocd/trunk@1920 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/Makefile.am | 3 | ||||
| -rw-r--r-- | src/helper/options.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index 77c6145..5e2d322 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,8 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/target \ - -DPKGDATADIR=\"$(pkgdatadir)\" \ - -DPKGLIBDIR=\"$(pkglibdir)\" + -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO noinst_LTLIBRARIES = libhelper.la diff --git a/src/helper/options.c b/src/helper/options.c index 53e23c9..8242a8d 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -97,10 +97,14 @@ int add_default_dirs(void) add_script_search_dir(strExePath); } #else - /* Add dir for openocd supplied scripts last so that user can over - ride those scripts if desired. */ - add_script_search_dir(PKGDATADIR); - add_script_search_dir(PKGLIBDIR); + /* + * The directory containing OpenOCD-supplied scripts should be + * listed last in the built-in search order, so the user can + * override these scripts with site-specific customizations. + */ + /// @todo Implement @c add_script_search_dir("${HOME}/.openocd"). + add_script_search_dir(PKGDATADIR "/site"); + add_script_search_dir(PKGDATADIR "/scripts"); #endif return ERROR_OK; } |