From 737a52d7b22b1774acc5d20f9bd25000a70ac116 Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Tue, 14 Feb 2012 12:57:18 +0000 Subject: [PATCH] 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 Reviewed-on: http://openocd.zylin.com/457 Tested-by: jenkins --- src/jtag/drivers/Makefile.am | 5 +++-- src/jtag/stlink/Makefile.am | 2 -- src/target/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 7dbaab2f90..134323d96f 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 diff --git a/src/jtag/stlink/Makefile.am b/src/jtag/stlink/Makefile.am index 09e47fd755..925d07ec9e 100644 --- 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 ab7b3be2fe..b98aacc08a 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 -- 2.30.2