diff options
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 77c61455..5e2d3224 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 53e23c95..8242a8dd 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; } |