- 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
-I$(top_srcdir)/src/flash \
-I$(top_srcdir)/src/pld
-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=\"\"
if RELEASE
libopenocd_la_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
AM_CPPFLAGS = \
-I$(top_srcdir)/src/server \
-I$(top_srcdir)/src/target \
AM_CPPFLAGS = \
-I$(top_srcdir)/src/server \
-I$(top_srcdir)/src/target \
- -DPKGDATADIR=\"$(pkgdatadir)\" \
- -DPKGLIBDIR=\"$(pkglibdir)\"
+ -DPKGDATADIR=\"$(pkgdatadir)\"
METASOURCES = AUTO
noinst_LTLIBRARIES = libhelper.la
METASOURCES = AUTO
noinst_LTLIBRARIES = libhelper.la
add_script_search_dir(strExePath);
}
#else
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;
}
#endif
return ERROR_OK;
}
-I$(top_srcdir)/src/target \
-I$(top_srcdir)/src/flash \
-I$(top_srcdir)/src/jtag \
-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
METASOURCES = AUTO
noinst_LTLIBRARIES = libserver.la
libserver_la_SOURCES += tcl_server.c
if HTTPD
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 \
+ )
* being subverted to evil purposes
*/
* being subverted to evil purposes
*/
- const char *httpd_dir=PKGLIBDIR "/httpd";
+ const char *httpd_dir = PKGDATADIR "/httpd";
Linking to existing account procedure
If you already have an account and want to add another login method
you
MUST first sign in with your existing account and
then change URL to read
https://review.openocd.org/login/?link
to get to this page again but this time it'll work for linking. Thank you.
SSH host keys fingerprints
1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=.. |
|+o.. . |
|*.o . . |
|+B . . . |
|Bo. = o S |
|Oo.+ + = |
|oB=.* = . o |
| =+=.+ + E |
|. .=o . o |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)