summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9207bd5f104..68d1391b96a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-01-04 Paul Eggert <eggert@cs.ucla.edu>
+ Clarify 'make info'
+ * Makefile.in (info): Use GNU make conditional rather than
+ an '@' rule with a shell conditional, so that the builder can
+ see the submake.
+
Less 'make' chatter for VCSWITNESS
* Makefile.in (dirstate, VCSWITNESS): New macros.
(src): Use them to lessen 'make' chatter.
diff --git a/Makefile.in b/Makefile.in
index 7b271f12424..4cdd293ebd4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1043,11 +1043,9 @@ uninstall-ps: $(UNINSTALL_PS)
# and it's not worth it. This case is only relevant if you download a
# release, then change the .texi files.
info:
- @if test "$(HAVE_MAKEINFO)" = "no"; then \
- echo "Configured --without-makeinfo, not building manuals" ; \
- else \
- $(MAKE) info-real info-dir; \
- fi
+ ifneq ($(HAVE_MAKEINFO),no)
+ $(MAKE) info-real info-dir
+ endif
## build-aux/make-info-dir expects only certain dircategories.
check-info: info