summaryrefslogtreecommitdiffstats
path: root/src/Makefile
diff options
context:
space:
mode:
authorMichael Brown2007-12-08 01:50:57 +0100
committerMichael Brown2007-12-08 01:50:57 +0100
commita8bddfe1537a0a69b7fde557e11ccba625b7bd7d (patch)
treeb22352efc368973cf2c2f13c22d9e8f5f08a1d21 /src/Makefile
parentRemove the (unused) option to override _prefix_link_addr, (diff)
downloadipxe-a8bddfe1537a0a69b7fde557e11ccba625b7bd7d.tar.gz
ipxe-a8bddfe1537a0a69b7fde557e11ccba625b7bd7d.tar.xz
ipxe-a8bddfe1537a0a69b7fde557e11ccba625b7bd7d.zip
Another (hopefully more robust) attempt to find a usable substitute
for "echo -e" on the host system.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/Makefile b/src/Makefile
index add47abe..a65ce2bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
# Initialise variables that get added to throughout the various Makefiles
#
-MAKEDEPS := Makefile .toolcheck
+MAKEDEPS := Makefile .toolcheck .echocheck
SRCDIRS :=
SRCS :=
NON_AUTO_SRCS :=
@@ -9,24 +9,6 @@ ROMS :=
MEDIA :=
NON_AUTO_MEDIA :=
-# Find a usable "echo -e" substitute.
-#
-ifeq ($(shell echo '\101'),A)
-ECHO ?= echo
-endif
-ifeq ($(shell echo -e '\101'),A)
-ECHO ?= echo -e
-endif
-ifeq ($(shell /bin/echo '\101'),A)
-ECHO ?= /bin/echo
-endif
-ifeq ($(shell /bin/echo -e '\101'),A)
-ECHO ?= /bin/echo -e
-endif
-ifndef ECHO
-ECHO := echo
-endif
-
# Grab the central Config file.
#
MAKEDEPS += Config
@@ -90,6 +72,7 @@ RM ?= rm -f
TOUCH ?= touch
MKDIR ?= mkdir
CP ?= cp
+ECHO ?= echo
PERL ?= /usr/bin/perl
CC ?= $(CROSS_COMPILE)gcc
AS ?= $(CROSS_COMPILE)as