From 2d45ae5a013a0353688d92c3e93b7e53a2939a96 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 4 Oct 2011 10:24:40 -0600 Subject: [PATCH] build: fix 'make distcheck' with pdwtags installed I am getting this failure with 'make distcheck': GEN ../../src/remote_protocol-structs /bin/sh: ../../src/remote_protocol-structs-t: Permission denied make[4]: *** [../../src/remote_protocol-structs] Error 1 since it attempts a sub-run of a VPATH 'make check' where $(srcdir) is intentionally read-only. I'm not sure which commit introduced the problem, although I suspect it was around 62dee6f when I refactored protocol struct checking to be more powerful. $(@F) is required by POSIX, and although it is not yet portable to all make implementations, we already require GNU make. * src/Makefile.am (PDWTAGS): Generate temp file into current directory, since $(srcdir) is read-only during distcheck. --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 738ee91237..9650139732 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -255,9 +255,9 @@ PDWTAGS = \ -e ' exit 8;' \ -e ' }' \ -e '}' \ - > $@-t; \ + > $(@F)-t; \ case $$? in 8) exit 0;; 0) ;; *) exit 1;; esac; \ - diff -u $@-t $@; st=$$?; rm -f $@-t; exit $$st; \ + diff -u $(@F)-t $@; st=$$?; rm -f $(@F)-t; exit $$st; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \ echo 'WARNING: install the dwarves package to get pdwtags' >&2; \