Browse Source

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
tags/v0.2.0
zwelch 13 years ago
parent
commit
dd86b54e6e
5 changed files with 18 additions and 13 deletions
  1. +1
    -4
      src/Makefile.am
  2. +1
    -2
      src/helper/Makefile.am
  3. +8
    -4
      src/helper/options.c
  4. +7
    -2
      src/server/Makefile.am
  5. +1
    -1
      src/server/httpd.c

+ 1
- 4
src/Makefile.am View File

@@ -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=\"\"


+ 1
- 2
src/helper/Makefile.am View File

@@ -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


+ 8
- 4
src/helper/options.c View File

@@ -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;
}


+ 7
- 2
src/server/Makefile.am View File

@@ -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 = \


+ 1
- 1
src/server/httpd.c View File

@@ -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=='/')
{


Loading…
Cancel
Save