Reduce "set +x" noise in (un)install targets.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a6782d7c460cd08ea4056d21d423099658670fa0..469f962de2953bbdc9e49d5be50902c7ceac70ab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,12 +55,18 @@ src/parse-decl.lo: src/scan.h src/parse.h
 src/typemap.lo: src/validtypes.h
 src/error.lo: src/errtab.h
 src/normalize.lo: src/ordspecs.h
+src/output.lo: src/namespecs.h
 
 src/validtypes.h: $(srcdir)/src/types.lst $(srcdir)/src/validtypes.sed
        $(AM_V_GEN)sed -f $(srcdir)/src/validtypes.sed \
                < $(srcdir)/src/types.lst > $@.tmp
        $(AM_V_at)mv -f $@.tmp $@
 
+src/namespecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/namespecs.sed
+       $(AM_V_GEN) sed -f $(srcdir)/src/namespecs.sed \
+               < $(srcdir)/src/specs.lst > $@.tmp
+       $(AM_V_at) mv -f $@.tmp $@
+
 src/ordspecs.h: $(srcdir)/src/specs.lst $(srcdir)/src/ordspecs.sed
        $(AM_V_GEN) sed -f $(srcdir)/src/ordspecs.sed \
                < $(srcdir)/src/specs.lst > $@.tmp
@@ -98,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
@@ -110,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
@@ -121,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