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

diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index 7dbaab2f9049f2d7ec14db9a023a11abb8889dbf..134323d96fc2c7d0433f8587c64d36e66fbf617b 100644 (file)
--- 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

diff --git a/src/jtag/stlink/Makefile.am b/src/jtag/stlink/Makefile.am
index 09e47fd7550f79834c1a7f696535f8774a9d9185..925d07ec9ee20364f134e1c42d271cc34f55876c 100644 (file)
--- a/src/jtag/stlink/Makefile.am
+++ b/src/jtag/stlink/Makefile.am
@@ -5,8 +5,6 @@ noinst_LTLIBRARIES = libocdstlink.la
 libocdstlink_la_SOURCES = \
        $(STLINKFILES)
 
-nobase_dist_pkglib_DATA =
-
 STLINKFILES =
 
 if STLINK

diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index ab7b3be2fecdecd162f927d639f22be877eb2659..b98aacc08ad9f229c6c446093fe6c930260c7c12 100644 (file)
--- 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