From: Ben Pfaff Date: Sun, 21 Feb 2016 00:33:54 +0000 (-0800) Subject: Makefiles: Fix use of $(AM_V_at) in makefile rules. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=76f45fba02019d92050bdef346d3c4ce90022b42 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 fc9aba15da..0892a481c8 100644 --- 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 9787a92ad4..2061316651 100644 --- 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 $@ ; \