From 7804af20a363ed8e94d6e700505870cb4f550730 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Mon, 28 Nov 2011 22:03:07 -0500 Subject: [PATCH] Reduce "set +x" noise in (un)install targets. By judicious use of subshells, we can eliminate the need to call "set +x" explicitly, which should (slightly) reduce the noise of the (un)install targets. --- Makefile.am | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index ea3330c..469f962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,10 +104,10 @@ install-mo: $(MOFILES) lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \ test x"$$lang" = x"" && exit 1; \ inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \ - set -x; \ - $(MKDIR_P) "$$inst" || exit $$?; \ - $(INSTALL_DATA) "$$mo" "$$inst/$(PACKAGE).mo" || exit $$?; \ - set +x; \ + (set -x; $(MKDIR_P) "$$inst") \ + || exit $$?; \ + (set -x; $(INSTALL_DATA) "$$mo" "$$inst/$(PACKAGE).mo") \ + || exit $$?; \ done installdirs-local: installdirs-mo @@ -116,9 +116,7 @@ installdirs-mo: lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \ test x"$$lang" = x"" && exit 1; \ inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \ - set -x; \ - $(MKDIR_P) "$$inst" || exit $$?; \ - set +x; \ + (set -x; $(MKDIR_P) "$$inst") || exit $$?; \ done uninstall-local: uninstall-mo @@ -127,9 +125,7 @@ uninstall-mo: lang=`expr "$$mo" : '.*/\(.*\)\.mo' \| "$$mo" : '\(.*\)\.mo'`; \ test x"$$lang" = x"" && exit 1; \ inst="$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES"; \ - set -x; \ - cd "$$inst" && rm -f '$(PACKAGE).mo'; \ - set +x; \ + (set -x; cd "$$inst" && rm -f '$(PACKAGE).mo'); \ done .PHONY: install-mo installdirs-mo uninstall-mo -- 2.43.0