aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-10-11 14:01:20 -0700
committerGerald Combs <gerald@wireshark.org>2016-10-11 21:48:45 +0000
commit13139a9853df2af06186ecc18c0a40849282378b (patch)
treee8a3f584feaa6780f8df7680e421f5c82d170184 /wiretap
parentf92daa140bad09c78b4acf1fc7f76d7bab75d74e (diff)
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 <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index edfeb11ef9..4cacb0a501 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -249,7 +249,7 @@ dumpabi-libwiretap: all abi-descriptor.xml
cp *.h ../ws_symbol_export.h abi-check-headers/
abi-compliance-checker -log-path abi_logs/log.txt -l libwiretap -v1 `readlink .libs/libwiretap.so | sed 's/.*\.so\.//'` \
-relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
- cat logs/libwiretap/[0-9]*/log.txt
+ cat abi_logs/log.txt
cp -f abi_dumps/libwiretap/libwiretap_* .libs/
cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz