Skip to content
Snippets Groups Projects
Commit 1945af7e authored by Luigi Rizzo's avatar Luigi Rizzo
Browse files

simplify (hopefully) the printing of $(MAKE) in aligned output.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 6677325a
No related branches found
No related tags found
No related merge requests found
...@@ -293,16 +293,21 @@ else ...@@ -293,16 +293,21 @@ else
HAVEDOT=no HAVEDOT=no
endif endif
# $(MAKE) is printed in several places, and we want it to be a
# fixed size string. Define a variable whose name has also the
# same size, so we can easily align text.
ifeq ($(MAKE), gmake)
mK="gmake"
else
mK=" make"
endif
all: _all all: _all
@echo " +--------- Asterisk Build Complete ---------+" @echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +" @echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +" @echo " + can be installed by running: +"
@echo " + +" @echo " + +"
ifeq ($(MAKE), gmake) @echo " + $(mK) install +"
@echo " + $(MAKE) install +"
else
@echo " + $(MAKE) install +"
endif
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS) _all: cleantest $(SUBDIRS)
...@@ -518,22 +523,14 @@ install: datafiles bininstall $(SUBDIRS_INSTALL) ...@@ -518,22 +523,14 @@ install: datafiles bininstall $(SUBDIRS_INSTALL)
@echo " + configuration files (overwriting any +" @echo " + configuration files (overwriting any +"
@echo " + existing config files), run: +" @echo " + existing config files), run: +"
@echo " + +" @echo " + +"
ifeq ($(MAKE), gmake) @echo " + $(mK) samples +"
@echo " + $(MAKE) samples +"
else
@echo " + $(MAKE) samples +"
endif
@echo " + +" @echo " + +"
@echo " +----------------- or ---------------------+" @echo " +----------------- or ---------------------+"
@echo " + +" @echo " + +"
@echo " + You can go ahead and install the asterisk +" @echo " + You can go ahead and install the asterisk +"
@echo " + program documentation now or later run: +" @echo " + program documentation now or later run: +"
@echo " + +" @echo " + +"
ifeq ($(MAKE), gmake) @echo " + $(mK) progdocs +"
@echo " + $(MAKE) progdocs +"
else
@echo " + $(MAKE) progdocs +"
endif
@echo " + +" @echo " + +"
@echo " + **Note** This requires that you have +" @echo " + **Note** This requires that you have +"
@echo " + doxygen installed on your local system +" @echo " + doxygen installed on your local system +"
...@@ -730,11 +727,7 @@ uninstall: _uninstall ...@@ -730,11 +727,7 @@ uninstall: _uninstall
@echo " + directories, and logs, run the following +" @echo " + directories, and logs, run the following +"
@echo " + command: +" @echo " + command: +"
@echo " + +" @echo " + +"
ifeq ($(MAKE), gmake) @echo " + $(mK) uninstall-all +"
@echo " + $(MAKE) uninstall-all +"
else
@echo " + $(MAKE) uninstall-all +"
endif
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
uninstall-all: _uninstall uninstall-all: _uninstall
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment