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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b78d0922f990c3f1a09492698d31f2e97c3cd9d..c7c9e5ed2c3527910ff94d79f15bcdc1d0a734fa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,10 +26,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/flash \
        -I$(top_srcdir)/src/pld
 
-# pass path to prefix path
-libopenocd_la_CPPFLAGS = \
- -DPKGLIBDIR=\"$(pkglibdir)\" \
- -DPKGBLDDATE=\"`date +%F-%R`\"
+libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
 if RELEASE
 libopenocd_la_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"

diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 77c61455dc310edc782af06586d1c4881ecde813..5e2d3224130d548e941a41331418ae9061e3076d 100644 (file)
--- 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 53e23c954c9b4b86e7084618aead63d7e55f06b8..8242a8dd1bd70f1a8aac9b98bf9daa6942a9b520 100644 (file)
--- 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;
 }

diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6bdcc2db047b40c515ef6204e97ca4e726..17e067d2e2e40708f98bb0e61a51d667775e9fdb 100644 (file)
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/target \
        -I$(top_srcdir)/src/flash \
        -I$(top_srcdir)/src/jtag  \
-       -DPKGLIBDIR=\"$(pkglibdir)\"
+       -DPKGDATADIR=\"$(pkgdatadir)\"
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libserver.la
@@ -25,7 +25,12 @@ noinst_HEADERS += tcl_server.h
 libserver_la_SOURCES += tcl_server.c
 
 if HTTPD
-nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
+nobase_dist_pkgdata_DATA = \
+       $(wildcard \
+               $(srcdir)/httpd/*.tcl \
+               $(srcdir)/httpd/*.css \
+               $(srcdir)/httpd/menu_cuts/*.png \
+       )
 endif
 
 EXTRA_DIST = \

diff --git a/src/server/httpd.c b/src/server/httpd.c
index 6d9851533d8af87ece3c307b3133e810f6a175da..8ab5cb8feddff437b0febb164d6c70f5430849f2 100644 (file)
--- a/src/server/httpd.c
+++ b/src/server/httpd.c
@@ -393,7 +393,7 @@ static int ahc_echo(void * cls, struct MHD_Connection * connection,
         * being subverted to evil purposes
         */
 
-       const char *httpd_dir=PKGLIBDIR "/httpd";
+       const char *httpd_dir = PKGDATADIR "/httpd";
 
        if (*url=='/')
        {