Makefiles: Fix use of $(AM_V_at) in makefile rules.

These are only for use at the beginning of a rule and cause weirdness in
the middle since they expand to directives that begin with @, which "make"
understands but the shell does not.

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index fc9aba15dacd7c807e089f550bab4b65a7ea286e..0892a481c865e22af3fbff2490efccb7b3796680 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -123,8 +123,8 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile
        $(AM_V_at)echo "const char bare_version[] = \"$(VERSION)\";" >> $@,tmp
        $(AM_V_at)echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@,tmp
        $(AM_V_at)printf "const char announced_version[] = \"GNU $(PACKAGE) $(VERSION)\"" >> $@,tmp
-       @case `$(AM_V_at)echo $(VERSION) | $(AM_V_at)$(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
-         [13579]) $(AM_V_at)printf "\"\\\nThis is an unreleased test version. It is not recommended for production use. Use at your own risk\"" >> $@,tmp \
+       @case `echo $(VERSION) | $(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
+         [13579]) printf "\"\\\nThis is an unreleased test version. It is not recommended for production use. Use at your own risk\"" >> $@,tmp \
        ;;\
        esac
        $(AM_V_at)printf ";\n" >> $@,tmp

diff --git a/src/ui/gui/icons/automake.mk b/src/ui/gui/icons/automake.mk
index 9787a92ad45a987ab3e5077ac27baa4c60922943..2061316651ccb55af03baeae3c05e2aabf766fdc 100644 (file)
--- a/src/ui/gui/icons/automake.mk
+++ b/src/ui/gui/icons/automake.mk
@@ -62,7 +62,7 @@ if HAVE_GUI
 nodist_src_ui_gui_psppire_DATA = src/ui/gui/icons/splash.png
 
 src/ui/gui/icons/splash.png: $(top_srcdir)/src/ui/gui/icons/splash-t.png $(top_srcdir)/src/ui/gui/icons/splash-r.png Makefile
-       @case `$(AM_V_at)echo $(VERSION) | $(AM_V_at)$(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
+       @case `echo $(VERSION) | $(SED) -e 's/[0-9][0-9]*\.[0-9]*\([0-9]\)\.[0-9][0-9]*/\1/'` in \
          [13579]) cp $(top_srcdir)/src/ui/gui/icons/splash-t.png $@ ; \
        ;;\
          *) cp $(top_srcdir)/src/ui/gui/icons/splash-r.png $@ ; \