From: Friedrich Beckmann Date: Sun, 14 Feb 2016 19:44:15 +0000 (+0100) Subject: MacOS build - fixed src/libpspp/automake.c version.c generation X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=9bf0d33865adacfbe633f9e2e6f206d1715b8e60 MacOS build - fixed src/libpspp/automake.c version.c generation The build on MacOS failed because echo introduces newlines which produces syntax errors in the generated version.c file. I replaced the echo with printf. Fixes bug #47143: http://savannah.gnu.org/bugs/?47143 --- diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk index 29628596b3..fc9aba15da 100644 --- a/src/libpspp/automake.mk +++ b/src/libpspp/automake.mk @@ -122,12 +122,12 @@ src/libpspp/version.c: $(top_srcdir)/AUTHORS Makefile $(AM_V_at)echo "#include \"version.h\"" >> $@,tmp $(AM_V_at)echo "const char bare_version[] = \"$(VERSION)\";" >> $@,tmp $(AM_V_at)echo "const char version[] = \"GNU $(PACKAGE) $(VERSION)\";" >> $@,tmp - $(AM_V_at)echo "const char announced_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)echo "\"\nThis is an unreleased test version. It is not recommended for production use. Use at your own risk\"" >> $@,tmp \ + [13579]) $(AM_V_at)printf "\"\\\nThis is an unreleased test version. It is not recommended for production use. Use at your own risk\"" >> $@,tmp \ ;;\ esac - $(AM_V_at)echo ";" >> $@,tmp + $(AM_V_at)printf ";\n" >> $@,tmp $(AM_V_at)echo "const char host_system[] = \"$(host_triplet)\";" >> $@,tmp $(AM_V_at)echo "const char build_system[] = \"$(build_triplet)\";" >> $@,tmp $(AM_V_at)echo "const char locale_dir[] = \"$(datadir)/locale\";" >> $@,tmp