blob: cdc6c92ec194ce5df7dc07bed04b803fc3294d8e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116
Fix for automake 1.11.2+
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am
--- openocd-0.5.0/src/jtag/drivers/Makefile.am 2011-08-09 02:34:19.000000000 -0300
+++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am 2012-05-01 13:57:01.007561480 -0300
@@ -5,7 +5,8 @@
libocdjtagdrivers_la_SOURCES = \
$(DRIVERFILES)
-nobase_dist_pkglib_DATA =
+ocddatadir = $(pkglibdir)
+nobase_dist_ocddata_DATA =
ULINK_FIRMWARE = $(srcdir)/OpenULINK
@@ -64,7 +65,7 @@
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 += vsllink.c
diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am
--- openocd-0.5.0/src/target/Makefile.am 2011-08-09 02:34:19.000000000 -0300
+++ openocd-0.5.0.automake/src/target/Makefile.am 2012-05-01 13:57:01.934567076 -0300
@@ -165,7 +165,7 @@
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
|
