From 13139a9853df2af06186ecc18c0a40849282378b Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 11 Oct 2016 14:01:20 -0700 Subject: dumpabi: Fix log paths. Make sure the paths we pass to "cat" and "abi-compliance-checker -log-path" match. Change-Id: Ie68b445b9d92d85c0ed1eb508a78c0bcc960d061 Reviewed-on: https://code.wireshark.org/review/18156 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- epan/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/Makefile.am') diff --git a/epan/Makefile.am b/epan/Makefile.am index 11a2300614..4dbb95022e 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -582,7 +582,7 @@ dumpabi-libwireshark: all abi-descriptor.xml cp wmem/*.h abi-check-headers/wmem abi-compliance-checker -log-path abi_logs/log.txt -l libwireshark -v1 `readlink .libs/libwireshark.so | sed 's/.*\.so\.//'` \ -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ - cat abi_logs/log.txt logs/libwireshark/[0-9]*/log.txt + cat abi_logs/log.txt cp -f abi_dumps/libwireshark/libwireshark_* .libs/ cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz -- cgit v1.2.3