From dd86b54e6e03a0682eb8ed41006ffdfd837ffae0 Mon Sep 17 00:00:00 2001 From: zwelch Date: Wed, 27 May 2009 07:49:58 +0000 Subject: 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 --- src/helper/options.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/helper/options.c') 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; } -- cgit v1.2.3