Fix compilation for Ubuntu 9.04 on x86-64 when using --enable-httpd.

[openocd.git] / src / helper / options.c

diff --git a/src/helper/options.c b/src/helper/options.c
index 801bd11b2606708ffb981afeef3682596582afe0..8242a8dd1bd70f1a8aac9b98bf9daa6942a9b520 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -26,6 +26,7 @@
 
 #include "configuration.h"
 #include "log.h"
+// @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
 #include <getopt.h>
@@ -96,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;
 }