From: Willy Tarreau <w@1wt.eu>
Date: Sun, 16 Jun 2019 17:26:18 +0000 (+0200)
Subject: BUILD: makefile: do not use echo -n
X-Git-Tag: v2.0.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fb76036a3ac1e9c22d5aaf9425929fac20236b3;p=thirdparty%2Fhaproxy.git

BUILD: makefile: do not use echo -n

On certain UNIXes (Solaris at least), echo -n displays "-n". Let's
simply re-arrange the "if" block in the help message not to use it.
---

diff --git a/Makefile b/Makefile
index 94be6d1b3d..d62fead7a3 100644
--- a/Makefile
+++ b/Makefile
@@ -803,9 +803,11 @@ help:
 	$(Q)sed -ne "/^[^#]*$$/q;s/^# \?\(.*\)/\1/p" Makefile
 	$(Q)echo; \
 	   if [ -n "$(TARGET)" ]; then \
-	     echo -n "Current TARGET: $(TARGET)"; \
-	     if [ -z "$(set_target_defaults)" ]; then echo -n " (custom target)";fi; \
-	     echo;\
+	     if [ -n "$(set_target_defaults)" ]; then \
+	        echo "Current TARGET: $(TARGET)"; \
+	     else \
+	        echo "Current TARGET: $(TARGET) (custom target)"; \
+	     fi; \
 	   else \
 	     echo "TARGET not set, you may pass 'TARGET=xxx' to set one among :";\
 	     echo "  linux-glibc, solaris, freebsd, netbsd, osx, openbsd,"; \