maint: avoid spurious output if program not present

Some shells warn about missing programs before redirection;
the idiomatic way to silence them is to run the program check
inside a subshell, with the redirections outside the subshell.
But a subshell is only needed in places where it is reasonable
to expect the use of such a noisy shell in the first place.

* src/Makefile.am (remote_protocol-structs): Use subshell, for
FreeBSD 8.0 /bin/sh.
* cfg.mk (sc_preprocessor_indentation): Avoid subshell, since the
only users running cfg.mk can be assumed to have decent tools.

diff --git a/cfg.mk b/cfg.mk
index d1f84854c6152011fddaaa883337e962b264097d..7773d065fe1df56eb628d79fb23838f55b5cc188 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -252,7 +252,7 @@ sc_prohibit_trailing_blank_lines:
 preprocessor_exempt = (remote_(driver|protocol)\.h)$$
 # Enforce recommended preprocessor indentation style.
 sc_preprocessor_indentation:
-       @if (cppi --version >/dev/null 2>&1); then                      \
+       @if cppi --version >/dev/null 2>&1; then                        \
          $(VC_LIST_EXCEPT) | grep '\.[ch]$$'                           \
            | grep -vE '$(preprocessor_exempt)' | xargs cppi -a -c      \
            || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \

diff --git a/src/Makefile.am b/src/Makefile.am
index fe33ceaabdf7f7ad38f926ade9c1295f246fc73c..1542ab1662fd258912a70f2e2893bf155f39bba9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,7 +169,7 @@ EXTRA_DIST += remote/remote_protocol.x remote/rpcgen_fix.pl
 # * remove white space at end of buffer
 .PHONY: remote_protocol-structs
 remote_protocol-structs:
-       $(AM_V_GEN)if pdwtags --help > /dev/null 2>&1; then             \
+       $(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then           \
          pdwtags libvirt_driver_remote_la-remote_protocol.$(OBJEXT)    \
            | perl -0777 -n                                             \
                -e 'foreach my $$p (split m!\n\n/\* \d+ \*/\n!)'        \