From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 14 Oct 2015 17:33:59 +0000 (-0400)
Subject: Fix: Use 'echo' in a portable way
X-Git-Tag: v2.8.0-rc1~292
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=351e30315a400ad45812afa7567719eef37139ff;hp=18ecc6aedf929c6aeba25aa1f1c06d246f349c2b

Fix: Use 'echo' in a portable way

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/Makefile.am b/include/Makefile.am
index fd9d8d023..b67d262bc 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,7 +14,7 @@ version.h:
 	## We first create variables for the current git version and
 	## the locations of the version.h and version.h.tmpl files.
 	##
-	@echo -n "Generating version.h... "
+	@echo $(ECHO_N) "Generating version.h... $(ECHO_C)"
 	@(version_h_tmpl="$(top_srcdir)/include/version.h.tmpl"; \
 	if [ -f "$${version_h_tmpl}" ]; then \
 		version_h="$(top_builddir)/include/version.h"; \
@@ -35,7 +35,7 @@ version.h:
 			[ "$${version_h_tmpl}" -nt "$${version_h}" ]; then \
 			cp "$${version_h_tmpl}" "$${version_h}"; \
 		fi; \
-		echo -n "git version: \"$${git_version}\""; \
+		echo $(ECHO_N) "git version: \"$${git_version}\"$(ECHO_C)"; \
 		##
 		## We verify that git_version isn't the same as the one
 		## currently in the file (if there is one), as we don't
@@ -47,11 +47,11 @@ version.h:
 		if [ x"$${old_version}" != x"$${new_version}" ]; then \
 			$(SED) -i "s'$${version_match}'$${new_version}'" "$${version_h}"; \
 		else \
-			echo -n " (cached)"; \
+			echo $(ECHO_N) " (cached)$(ECHO_C)"; \
 		fi; \
-		echo -n "... "; \
+		echo $(ECHO_N) "... $(ECHO_C)"; \
 	fi)
-	@echo "ok"
+	@echo "$(ECHO_T)ok"
 
 ##
 ## version.h is defined as a .PHONY file even if it's a real file as