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.

diff --git a/Makefile.am b/Makefile.am
index ea3330c3e4babfba5b9787a9a8fc582526dd90a3..469f962de2953bbdc9e49d5be50902c7ceac70ab 100644 (file)
--- 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"; \
                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
        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"; \
                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
        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"; \
                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
        done
 
 .PHONY: install-mo installdirs-mo uninstall-mo