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

5 files changed, 18 insertions, 13 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b78d092..c7c9e5ed 100644
--- 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 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;
 }
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 2a723a6b..17e067d2 100644
--- 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 6d985153..8ab5cb8f 100644
--- 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=='/')
 	{