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/target/Makefile.am | |
| parent | b0ef9cf1171c2decd6c12536b8ae61e64f8931b7 (diff) | |
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/target/Makefile.am')
| -rw-r--r-- | src/target/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/target/Makefile.am b/src/target/Makefile.am index ab7b3be2..b98aacc0 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -164,7 +164,7 @@ noinst_HEADERS = \ avr32_mem.h \ avr32_regs.h -nobase_dist_pkglib_DATA = -nobase_dist_pkglib_DATA += ecos/at91eb40a.elf +ocddatadir = $(pkglibdir) +nobase_dist_ocddata_DATA = ecos/at91eb40a.elf MAINTAINERCLEANFILES = $(srcdir)/Makefile.in |