summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--top/GNUmakefile5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 30730926d1..9f68c7474a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-04-03 Eric Blake <ebb9@byu.net>
+ Make GNU make output nicer.
+ * top/GNUmakefile [!_have-Makefile]: Add dependency on
+ MAKECMDGOALS to enforce message for all command line targets. Set
+ srcdir for use in maint.mk.
+
Another maintainer tweak.
* top/GNUmakefile (_is-dist-target): Allow maintainer-distcheck as
a target that regenerates version.
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 42d7d12b70..bba62438bc 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -68,11 +68,16 @@ endif
else
.DEFAULT_GOAL := abort-due-to-no-makefile
+srcdir = .
# The package can override .DEFAULT_GOAL to run actions like autoreconf.
-include ./cfg.mk
include ./maint.mk
+ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
+$(MAKECMDGOALS): abort-due-to-no-makefile
+endif
+
abort-due-to-no-makefile:
@echo There seems to be no Makefile in this directory. 1>&2
@echo "You must run ./configure before running \`make'." 1>&2