aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-01-03 19:11:50 -0800
committerPaul Eggert2015-01-03 19:12:25 -0800
commitfec9b792f543c35b1a635b3a3326d496e3ca9012 (patch)
tree0455297707a4cb39b4587e18b71d167baf6dacf9
parent35127c362a47bc0c452791e18111e3411e22aa52 (diff)
downloademacs-fec9b792f543c35b1a635b3a3326d496e3ca9012.tar.gz
emacs-fec9b792f543c35b1a635b3a3326d496e3ca9012.zip
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.
-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 @@
12015-01-04 Paul Eggert <eggert@cs.ucla.edu> 12015-01-04 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Clarify 'make info'
4 * Makefile.in (info): Use GNU make conditional rather than
5 an '@' rule with a shell conditional, so that the builder can
6 see the submake.
7
3 Less 'make' chatter for VCSWITNESS 8 Less 'make' chatter for VCSWITNESS
4 * Makefile.in (dirstate, VCSWITNESS): New macros. 9 * Makefile.in (dirstate, VCSWITNESS): New macros.
5 (src): Use them to lessen 'make' chatter. 10 (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)
1043# and it's not worth it. This case is only relevant if you download a 1043# and it's not worth it. This case is only relevant if you download a
1044# release, then change the .texi files. 1044# release, then change the .texi files.
1045info: 1045info:
1046 @if test "$(HAVE_MAKEINFO)" = "no"; then \ 1046 ifneq ($(HAVE_MAKEINFO),no)
1047 echo "Configured --without-makeinfo, not building manuals" ; \ 1047 $(MAKE) info-real info-dir
1048 else \ 1048 endif
1049 $(MAKE) info-real info-dir; \
1050 fi
1051 1049
1052## build-aux/make-info-dir expects only certain dircategories. 1050## build-aux/make-info-dir expects only certain dircategories.
1053check-info: info 1051check-info: info