summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2019-04-20 07:25:00 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2019-04-20 07:25:00 +0000
commitc951c13f3814e02fc2df7ce8b2408337d3770660 (patch)
treef0de43e5dd3b3dd40898858c6d91cbfcce051ad7
parent19de7a2329da99e521247e28d57a5aa3737ad03e (diff)
parent12ffbf91197add094ff6c0f1513cf9c4c0a540d8 (diff)
downloadgnutls-c951c13f3814e02fc2df7ce8b2408337d3770660.tar.gz
Merge branch 'autoopts_guix' into 'master'
Makefile.am: Don't assume autoopts-config returns a single dash. See merge request gnutls/gnutls!976
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index f1c70d1e42..b1aa2e45f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,7 @@ libopts-check:
@echo "Checking whether included libopts matches the system's. If the"
@echo "check fails upgrade the included libopts."
@echo "*****************************************************************"
- test "`autoopts-config libsrc|cut -d '-' -f 2|sed 's/.tar.gz//'`" = "`cat $(srcdir)/src/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
+ test "`autoopts-config libsrc|awk -F '-' '{print $$NF}'|sed 's/.tar.gz//'`" = "`cat $(srcdir)/src/libopts/autoopts/options.h |grep OPTIONS_VERSION_STRING|cut -d '"' -f 2|sed 's/:/./g'`"
files-update: libopts-check abi-dump-latest
$(MAKE) -C doc/ compare-makefile || mv doc/tmp-compare-makefile $(srcdir)/doc/Makefile.am