aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorGlenn Morris2010-10-09 11:31:12 -0700
committerGlenn Morris2010-10-09 11:31:12 -0700
commitabd40fb4ee56c21965f52e20fc04cab630674ab0 (patch)
treebe2a75b0861862ba5e2a453c554ab0595b9c57ed /doc/lispref
parentf4f358f172feadc4c706e540f17e0989c2e1c9b8 (diff)
downloademacs-abd40fb4ee56c21965f52e20fc04cab630674ab0.tar.gz
emacs-abd40fb4ee56c21965f52e20fc04cab630674ab0.zip
Avoid having a directory as a prerequisite in doc Makefiles.
It does not play well with time-stamping. * doc/misc/Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. Use it in all the info rules, rather than depending on infodir. * doc/lispref/Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/elisp): Use $mkinfodir instead of infodir. * doc/lispintro/Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/eintr): Use $mkinfodir instead of infodir. * doc/emacs/Makefile.in ($(infodir)): Delete rule. (mkinfodir): New. ($(infodir)/emacs): Use $mkinfodir instead of infodir.
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/Makefile.in8
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8a3242a6859..262c3bc4826 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,11 @@
12010-10-09 Glenn Morris <rgm@gnu.org> 12010-10-09 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in ($(infodir)): Delete rule.
4 (mkinfodir): New.
5 ($(infodir)/elisp): Use $mkinfodir instead of infodir.
6
72010-10-09 Glenn Morris <rgm@gnu.org>
8
3 * Makefile.in (emacsdir): New variable. 9 * Makefile.in (emacsdir): New variable.
4 (MAKEINFO): Add -I $emacsdir. 10 (MAKEINFO): Add -I $emacsdir.
5 (dist): Copy emacsver.texi. 11 (dist): Copy emacsver.texi.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 4336a25d5ee..e5786bfd5f2 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -96,6 +96,8 @@ srcs = \
96 $(srcdir)/gpl.texi \ 96 $(srcdir)/gpl.texi \
97 $(srcdir)/doclicense.texi 97 $(srcdir)/doclicense.texi
98 98
99mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
100
99.PHONY: info dvi pdf 101.PHONY: info dvi pdf
100 102
101# The info file is named `elisp'. 103# The info file is named `elisp'.
@@ -103,10 +105,8 @@ info: $(infodir)/elisp
103dvi: elisp.dvi 105dvi: elisp.dvi
104pdf: elisp.pdf 106pdf: elisp.pdf
105 107
106$(infodir): 108$(infodir)/elisp: $(srcs)
107 mkdir $@ || test -d $@ 109 $(mkinfodir)
108
109$(infodir)/elisp: $(infodir) $(srcs)
110 cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@ 110 cd $(srcdir); $(MAKEINFO) -I. -I$(texinfodir) elisp.texi -o $@
111 111
112elisp.dvi: $(srcs) 112elisp.dvi: $(srcs)