Makefile tweakage - make sure build messages suggest using correct make version

darcs-hash:20061129142004-ac50b-2776b3e6db870f6e04836a7d6e464e09d20f6274.gz
This commit is contained in:
axel 2006-11-30 00:20:04 +10:00
parent e0322bf0e0
commit 8062eb3511

View file

@ -262,7 +262,7 @@ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish share/config_interactive.fish $(TRANSLATIONS) all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish share/config_interactive.fish $(TRANSLATIONS)
@echo fish has now been built. @echo fish has now been built.
@echo Use \'make install\' to install fish. @echo Use \'$(MAKE) install\' to install fish.
.PHONY: all .PHONY: all
@ -284,7 +284,7 @@ Makefile: Makefile.in configure
# #
debug: debug:
make fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g" $(MAKE) fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g"
.PHONY: debug .PHONY: debug
@ -510,8 +510,8 @@ check-uninstall:
echo;\ echo;\
echo An older fish installation using an incompatible filesystem hierarchy was detected;\ echo An older fish installation using an incompatible filesystem hierarchy was detected;\
echo You must uninstall this fish version before proceeding;\ echo You must uninstall this fish version before proceeding;\
echo type \'make uninstall-legacy\' to uninstall these files,;\ echo type \'$(MAKE) uninstall-legacy\' to uninstall these files,;\
echo or type \'make force-install\' to force installation.;\ echo or type \'$(MAKE) force-install\' to force installation.;\
echo The latter may result in a broken installation.;\ echo The latter may result in a broken installation.;\
echo;\ echo;\
false;\ false;\
@ -522,7 +522,7 @@ check-uninstall:
echo;\ echo;\
echo An older fish installation using an incompatible filesystem hierarchy was detected;\ echo An older fish installation using an incompatible filesystem hierarchy was detected;\
echo You must remove the file $(DESTDIR)$(sysconfdir)/fish before proceeding;\ echo You must remove the file $(DESTDIR)$(sysconfdir)/fish before proceeding;\
echo type \'make uninstall-legacy\' to uninstall this file,;\ echo type \'$(MAKE) uninstall-legacy\' to uninstall this file,;\
echo or remove it manually using \'rm $(DESTDIR)$(sysconfdir)/fish\'.;\ echo or remove it manually using \'rm $(DESTDIR)$(sysconfdir)/fish\'.;\
echo;\ echo;\
false;\ false;\