Rename infodir to buildinfodir in doc/*/Makefile.in (bug#11737)

This also makes it clearer that it has no relation to the "infodir"
used by install.

2 files changed, 11 insertions, 6 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a3f713912e0..ed9aab245ea 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-19  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+
 2012-06-11  Chong Yidong  <cyd@gnu.org>
 
         * elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index efd5e39a0eb..dafe5bc8964 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -24,7 +24,7 @@ srcdir = @srcdir@
 
 version=@version@
 
-infodir = $(srcdir)/../../info
+buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
@@ -96,18 +96,18 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
 
 .PHONY: info dvi pdf ps
 
-info: $(infodir)/elisp
+info: $(buildinfodir)/elisp
 dvi: elisp.dvi
 html: elisp.html
 pdf: elisp.pdf
 ps: elisp.ps
 
 ## Note: "<" is not portable in ordinary make rules.
-$(infodir)/elisp: $(srcs)
+$(buildinfodir)/elisp: $(srcs)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $(srcdir)/elisp.texi
 
@@ -140,7 +140,7 @@ clean: mostlyclean
 distclean: clean
 
 infoclean:
-        -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
+        -cd $(buildinfodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -155,7 +155,8 @@ dist:
           ${srcdir}/README emacs-lispref-${version}/
         sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
           -e 's/^\(emacsdir *=\).*/\1 ./' \
-          -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          -e 's/^\(buildinfodir *=\).*/\1 ./' \
+          -e 's/^\(clean:.*\)/\1 infoclean/' \
           -e "s/@ver[s]ion@/${version}/" \
           ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
         tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}