[Openocd-svn] r1920 - in trunk/src: . helper server

[<zw...@ma...>]

Author: zwelch
Date: 2009-05-27 09:49:58 +0200 (Wed, 27 May 2009)
New Revision: 1920

Modified:
   trunk/src/Makefile.am
   trunk/src/helper/Makefile.am
   trunk/src/helper/options.c
   trunk/src/server/Makefile.am
   trunk/src/server/httpd.c
Log:
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


Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-05-27 06:49:24 UTC (rev 1919)
+++ trunk/src/Makefile.am	2009-05-27 07:49:58 UTC (rev 1920)
@@ -26,10 +26,7 @@
 	-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=\"\"

Modified: trunk/src/helper/Makefile.am
===================================================================
--- trunk/src/helper/Makefile.am	2009-05-27 06:49:24 UTC (rev 1919)
+++ trunk/src/helper/Makefile.am	2009-05-27 07:49:58 UTC (rev 1920)
@@ -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

Modified: trunk/src/helper/options.c
===================================================================
--- trunk/src/helper/options.c	2009-05-27 06:49:24 UTC (rev 1919)
+++ trunk/src/helper/options.c	2009-05-27 07:49:58 UTC (rev 1920)
@@ -97,10 +97,14 @@
 		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;
 }

Modified: trunk/src/server/Makefile.am
===================================================================
--- trunk/src/server/Makefile.am	2009-05-27 06:49:24 UTC (rev 1919)
+++ trunk/src/server/Makefile.am	2009-05-27 07:49:58 UTC (rev 1920)
@@ -3,7 +3,7 @@
 	-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 @@
 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 = \

Modified: trunk/src/server/httpd.c
===================================================================
--- trunk/src/server/httpd.c	2009-05-27 06:49:24 UTC (rev 1919)
+++ trunk/src/server/httpd.c	2009-05-27 07:49:58 UTC (rev 1920)
@@ -393,7 +393,7 @@
 	 * being subverted to evil purposes
 	 */
 
-	const char *httpd_dir=PKGLIBDIR "/httpd";
+	const char *httpd_dir = PKGDATADIR "/httpd";
 
 	if (*url=='/')
 	{