diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-14 12:57:18 +0000 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2012-02-16 08:56:42 +0000 |
| commit | 737a52d7b22b1774acc5d20f9bd25000a70ac116 (patch) | |
| tree | 93a4fab87d145dddd3e0e2e9a12fa1d62a4b016a /src/jtag/drivers/Makefile.am | |
| parent | b0ef9cf1171c2decd6c12536b8ae61e64f8931b7 (diff) | |
| download | riscv-openocd-737a52d7b22b1774acc5d20f9bd25000a70ac116.zip riscv-openocd-737a52d7b22b1774acc5d20f9bd25000a70ac116.tar.gz riscv-openocd-737a52d7b22b1774acc5d20f9bd25000a70ac116.tar.bz2 | |
build: fix automake 1.11.2 issues
automake 1.11.2 throws `pkglibdir' is not a legitimate directory for `DATA'
if nobase_dist_pkglib_DATA is used.
We work around this issue by defining our own location.
Change-Id: I3c29e2df0b67e745283c50d358e31699bd60dc74
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/457
Tested-by: jenkins
Diffstat (limited to 'src/jtag/drivers/Makefile.am')
| -rw-r--r-- | src/jtag/drivers/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 7dbaab2..134323d 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -5,7 +5,8 @@ noinst_LTLIBRARIES = libocdjtagdrivers.la libocdjtagdrivers_la_SOURCES = \ $(DRIVERFILES) -nobase_dist_pkglib_DATA = +ocddatadir = $(pkglibdir) +nobase_dist_ocddata_DATA = ULINK_FIRMWARE = $(srcdir)/OpenULINK @@ -74,7 +75,7 @@ DRIVERFILES += rlink.c rlink_speed_table.c endif if ULINK DRIVERFILES += ulink.c -nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex +nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex endif if VSLLINK DRIVERFILES += versaloon/usbtoxxx/usbtogpio.c |