From: Micah Cowan <micah@cowan.name>
Date: Wed, 22 Apr 2009 18:44:13 +0000 (-0700)
Subject: Automated merge.
X-Git-Tag: v1.13~361
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=bb2cba2cc7fcd0055d978aea4b31b8fc01841fc8;hp=116b261a9f1ccd945c16e9ad3afc2e85f1fb95b1

Automated merge.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 37d39d80..28cb6640 100644
--- 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 441cfa1b..16e4bcb0 100644
--- 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)'";' \