Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Try to fix echo-detection to work on all systems that provide any
suitable "echo -e" substitute.
  • Loading branch information
Michael Brown committed Dec 7, 2007
1 parent 1949641 commit 3b58fc0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
13 changes: 12 additions & 1 deletion src/Makefile
Expand Up @@ -9,6 +9,18 @@ ROMS :=
MEDIA :=
NON_AUTO_MEDIA :=

# Find a usable "echo -e".
#
ifeq ($(shell echo '\0101'),A)
ECHO := echo
else ifeq ($(shell echo -e '\0101'),A)
ECHO := echo -e
else ifeq ($(shell /bin/echo '\0101'),A)
ECHO := /bin/echo
else ifeq ($(shell /bin/echo -e '\0101'),A)
ECHO := /bin/echo -e
endif

# Grab the central Config file.
#
MAKEDEPS += Config
Expand Down Expand Up @@ -66,7 +78,6 @@ noargs : blib $(BIN)/NIC $(BIN)/gpxe.dsk $(BIN)/gpxe.iso $(BIN)/gpxe.usb

# Locations of utilities
#
ECHO ?= /bin/echo -e
HOST_CC ?= gcc
CPP ?= gcc -E -Wp,-Wall
RM ?= rm -f
Expand Down
5 changes: 5 additions & 0 deletions src/Makefile.housekeeping
Expand Up @@ -7,6 +7,11 @@
#
CLEANUP := $(BIN)/*.* # *.* to avoid catching the "CVS" directory

# Show what we're using for "echo -e"
#
echo :
@$(ECHO) Using "$(ECHO)" to echo

# Version number calculations
#
VERSION_MAJOR = 0
Expand Down

0 comments on commit 3b58fc0

Please sign in to comment.