diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-27 07:49:58 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-05-27 07:49:58 +0000 |
| commit | dd86b54e6e03a0682eb8ed41006ffdfd837ffae0 (patch) | |
| tree | fcd056391c8d98cad8823a9dbb0576c1e373dabe /src/server | |
| parent | dbbc9c41f7db210b0a4e226540a28e0a8a5019bf (diff) | |
| download | openocd+libswd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.tar.gz openocd+libswd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.tar.bz2 openocd+libswd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.tar.xz openocd+libswd-dd86b54e6e03a0682eb8ed41006ffdfd837ffae0.zip | |
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
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Makefile.am | 9 | ||||
| -rw-r--r-- | src/server/httpd.c | 2 |
2 files changed, 8 insertions, 3 deletions
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=='/') { |