Automated merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37d39d80fd54b5960c74a94c1ea442ef72895a3a..28cb6640acbffd0a9c364a4a4707392338a592fa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-20  Micah Cowan  <micah@cowan.name>
+
+       * Makefile.am (version.c): Fix unportable use of "echo -n".
+
 2009-04-13  Steven Schubiger  <stsc@member.fsf.org>
 
        * ftp.c (ftp_retrieve_list): Move the duplicated code that

diff --git a/src/Makefile.am b/src/Makefile.am
index 441cfa1b3a3310aa631c752d36a8a47d993b4bab..16e4bcb0d87c4da64f55eaff7cc817942485583f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,7 @@ version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
        echo '/* version.c */' > $@
        echo '/* Autogenerated by Makefile - DO NOT EDIT */' >> $@
        echo '' >> $@
-       echo -n 'const char *version_string = "@VERSION@"' >> $@
+       echo 'const char *version_string = "@VERSION@"' >> $@
        -hg log -r . --template='" ({node|short})"\n' 2>/dev/null >> $@
        echo ';' >> $@
        echo 'const char *compilation_string = "'$(COMPILE)'";' \