aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorGlenn Morris2012-05-02 00:45:16 -0700
committerGlenn Morris2012-05-02 00:45:16 -0700
commit9aa071dfb9739328b39b9cbb4130b39b5ed30c85 (patch)
tree423c5ada2ab9d61637f0718ca1c6530f9e24d8a7 /doc/misc
parent226b674362163c251ffc43954e8f7b80822de57d (diff)
downloademacs-9aa071dfb9739328b39b9cbb4130b39b5ed30c85.tar.gz
emacs-9aa071dfb9739328b39b9cbb4130b39b5ed30c85.zip
Don't hard-code the list of info files in the top-level Makefile
The sed '/ing directory/d' piece is to remove the annoying "entering/leaving directory" messages that GNU make insists on printing when called recursively. --no-print-directory isn't portable. * Makefile.in (INFO_FILES): Remove variable. (INFO_NONMISC): New variable. (install-arch-indep, uninstall): Don't use $INFO_FILES. * doc/misc/Makefile.in (echo-info): New phony target, used by top-level.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog2
-rw-r--r--doc/misc/Makefile.in7
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index e8ebe45e8ba..0d6300a1b82 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,7 @@
12012-05-02 Glenn Morris <rgm@gnu.org> 12012-05-02 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (echo-info): New phony target, used by top-level.
4
3 * viper.texi: Make direntry shorter (also it is no longer "newest"). 5 * viper.texi: Make direntry shorter (also it is no longer "newest").
4 6
5 * emacs-gnutls.texi, ert.texi, org.texi: 7 * emacs-gnutls.texi, ert.texi, org.texi:
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 390b077bbb0..383ec3a9db9 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -43,7 +43,6 @@ emacsdir = $(srcdir)/../emacs
43MAKEINFO = @MAKEINFO@ 43MAKEINFO = @MAKEINFO@
44MAKEINFO_OPTS = --force -I$(emacsdir) 44MAKEINFO_OPTS = --force -I$(emacsdir)
45 45
46# Also add new entries to INFO_FILES in the top-level Makefile.in.
47INFO_TARGETS = \ 46INFO_TARGETS = \
48 $(infodir)/ada-mode \ 47 $(infodir)/ada-mode \
49 $(infodir)/auth \ 48 $(infodir)/auth \
@@ -210,7 +209,11 @@ ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
210 209
211mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} 210mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
212 211
213.PHONY: info dvi pdf 212.PHONY: info dvi pdf echo-info
213
214## Used by top-level Makefile.
215echo-info:
216 @echo $(INFO_TARGETS) | sed 's|[^ ]*/||g'
214 217
215info: $(INFO_TARGETS) 218info: $(INFO_TARGETS)
216 219