diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7c9e48b1393..ca649f70b0c 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/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>
 
 	* emacs.texi: Remove urlcolor setting.
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index b25f6dbe490..a516e75be67 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -31,7 +31,7 @@ version=@version@
 ## This is a bit funny.  Because the info files are in the
 ## distribution tarfiles, they are always made in $scrdir/../../info,
 ## even for out-of-tree builds.
-infodir = $(srcdir)/../../info
+buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
@@ -114,11 +114,11 @@ EMACSSOURCES= \
 ## repository and the release tarfiles.  We do not use any
 ## equivalent of mkdir -p/install-sh -d, so this is not a general
 ## solution anyway.  The second test -d is for parallel builds.
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
 
 .PHONY: info dvi html pdf ps
 
-info: $(infodir)/emacs
+info: $(buildinfodir)/emacs
 dvi: emacs.dvi
 html: emacs.html
 pdf: emacs.pdf
@@ -128,7 +128,7 @@ ps: emacs.ps
 # There is no provision for Info files to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 # Note: "<" is not portable in ordinary make rules.
-$(infodir)/emacs: ${EMACSSOURCES}
+$(buildinfodir)/emacs: ${EMACSSOURCES}
 	$(mkinfodir)
 	$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs.texi
 
@@ -171,7 +171,7 @@ distclean: clean
 
 ## In the standalone tarfile, the clean rule runs this.
 infoclean:
-	-cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
+	-cd $(buildinfodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -185,7 +185,8 @@ dist:
 	cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
 	  ${srcdir}/ChangeLog* emacs-manual-${version}/
 	sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\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-manual-${version}/Makefile
 	tar -cf emacs-manual-${version}.tar emacs-manual-${version}
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 76397c3ee89..0cf74ae5878 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
 	* Version 24.1 released.
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index c638dd6135f..df5248dff3d 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -22,7 +22,7 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 version=@version@
 
-infodir = $(srcdir)/../../info
+buildinfodir = $(srcdir)/../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
@@ -35,11 +35,11 @@ DVIPS = dvips
 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
-mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
 
 .PHONY: info dvi html pdf ps
 
-info: ${infodir}/eintr
+info: ${buildinfodir}/eintr
 
 dvi: emacs-lisp-intro.dvi
 html: emacs-lisp-intro.html
@@ -49,7 +49,7 @@ ps: emacs-lisp-intro.ps
 # The file name eintr must fit within 5 characters, to allow for
 # -NN extensions to fit into DOS 8+3 limits without clashing.
 # Note: "<" is not portable in ordinary make rules.
-${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
+${buildinfodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
 	$(mkinfodir)
 	$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
 
@@ -79,7 +79,7 @@ clean: mostlyclean
 distclean: clean
 
 infoclean:
-	-cd $(infodir) && rm -f eintr eintr-[1-9]
+	-cd $(buildinfodir) && rm -f eintr eintr-[1-9]
 
 maintainer-clean: distclean infoclean
 
@@ -92,7 +92,8 @@ dist:
 	  ${texinfodir}/texinfo.tex \
 	  ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
 	sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\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-lispintro-${version}/Makefile
 	tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
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}
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 1e9d10b89db..389e937932b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-19  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+
 2012-06-01  Chong Yidong  <cyd@gnu.org>
 
 	* Version 24.1 released.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index e387631ba76..dd8cf4b9014 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -26,14 +26,14 @@ srcdir=@srcdir@
 
 # Tell make where to find source files; this is needed for the makefiles.
 # Note the other doc Makefiles do not use VPATH anymore, instead
-# they set infodir to an absolute path.  Not doing that here in
+# they set buildinfodir to an absolute path.  Not doing that here in
 # case INFO_TARGETS gets too long for some feeble shells.
 # (cf src/Makefile.in's passing of $lisp to make-docfile)
 VPATH=@srcdir@
 
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
-infodir=../../info
+buildinfodir=../../info
 ## Directory with emacsver.texi.
 ## Currently only used by efaq and calc.
 emacsdir = $(srcdir)/../emacs
@@ -45,56 +45,56 @@ MAKEINFO_OPTS = --force -I$(emacsdir)
 
 # Also add new entries to INFO_FILES in the top-level Makefile.in.
 INFO_TARGETS = \
-	$(infodir)/ada-mode \
-	$(infodir)/auth \
-	$(infodir)/autotype \
-	$(infodir)/calc \
-	$(infodir)/ccmode \
-	$(infodir)/cl \
-	$(infodir)/dbus \
-	$(infodir)/dired-x \
-	$(infodir)/ebrowse \
-	$(infodir)/ede \
-	$(infodir)/ediff \
-	$(infodir)/edt \
-	$(infodir)/eieio \
-	$(infodir)/emacs-mime \
-	$(infodir)/epa \
-	$(infodir)/erc \
-	$(infodir)/ert \
-	$(infodir)/eshell \
-	$(infodir)/eudc \
-	$(infodir)/efaq \
-	$(infodir)/flymake \
-	$(infodir)/forms \
-	$(infodir)/gnus \
-	$(infodir)/emacs-gnutls \
-	$(infodir)/idlwave \
-	$(infodir)/info \
-	$(infodir)/mairix-el \
-	$(infodir)/message \
-	$(infodir)/mh-e \
-	$(infodir)/newsticker \
-	$(infodir)/nxml-mode \
-	$(infodir)/org \
-	$(infodir)/pcl-cvs \
-	$(infodir)/pgg \
-	$(infodir)/rcirc \
-	$(infodir)/remember \
-	$(infodir)/reftex \
-	$(infodir)/sasl \
-	$(infodir)/sc \
-	$(infodir)/semantic \
-	$(infodir)/ses \
-	$(infodir)/sieve \
-	$(infodir)/smtpmail \
-	$(infodir)/speedbar \
-	$(infodir)/tramp \
-	$(infodir)/url \
-	$(infodir)/vip \
-	$(infodir)/viper \
-	$(infodir)/widget \
-	$(infodir)/woman
+	$(buildinfodir)/ada-mode \
+	$(buildinfodir)/auth \
+	$(buildinfodir)/autotype \
+	$(buildinfodir)/calc \
+	$(buildinfodir)/ccmode \
+	$(buildinfodir)/cl \
+	$(buildinfodir)/dbus \
+	$(buildinfodir)/dired-x \
+	$(buildinfodir)/ebrowse \
+	$(buildinfodir)/ede \
+	$(buildinfodir)/ediff \
+	$(buildinfodir)/edt \
+	$(buildinfodir)/eieio \
+	$(buildinfodir)/emacs-mime \
+	$(buildinfodir)/epa \
+	$(buildinfodir)/erc \
+	$(buildinfodir)/ert \
+	$(buildinfodir)/eshell \
+	$(buildinfodir)/eudc \
+	$(buildinfodir)/efaq \
+	$(buildinfodir)/flymake \
+	$(buildinfodir)/forms \
+	$(buildinfodir)/gnus \
+	$(buildinfodir)/emacs-gnutls \
+	$(buildinfodir)/idlwave \
+	$(buildinfodir)/info \
+	$(buildinfodir)/mairix-el \
+	$(buildinfodir)/message \
+	$(buildinfodir)/mh-e \
+	$(buildinfodir)/newsticker \
+	$(buildinfodir)/nxml-mode \
+	$(buildinfodir)/org \
+	$(buildinfodir)/pcl-cvs \
+	$(buildinfodir)/pgg \
+	$(buildinfodir)/rcirc \
+	$(buildinfodir)/remember \
+	$(buildinfodir)/reftex \
+	$(buildinfodir)/sasl \
+	$(buildinfodir)/sc \
+	$(buildinfodir)/semantic \
+	$(buildinfodir)/ses \
+	$(buildinfodir)/sieve \
+	$(buildinfodir)/smtpmail \
+	$(buildinfodir)/speedbar \
+	$(buildinfodir)/tramp \
+	$(buildinfodir)/url \
+	$(buildinfodir)/vip \
+	$(buildinfodir)/viper \
+	$(buildinfodir)/widget \
+	$(buildinfodir)/woman
 
 DVI_TARGETS = \
 	ada-mode.dvi \
@@ -208,7 +208,7 @@ TEXI2PDF = texi2pdf
 ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
          MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
 
-mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
+mkinfodir = @cd ${srcdir}; test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
 
 .PHONY: info dvi pdf
 
@@ -230,8 +230,8 @@ pdf: $(PDF_TARGETS)
 # Note: "<" is not portable in ordinary make rules.
 
 ## "short" target names for convenience, to just rebuild one manual.
-ada-mode : $(infodir)/ada-mode
-$(infodir)/ada-mode: ada-mode.texi
+ada-mode : $(buildinfodir)/ada-mode
+$(buildinfodir)/ada-mode: ada-mode.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
 ada-mode.dvi: ${srcdir}/ada-mode.texi
@@ -239,8 +239,8 @@ ada-mode.dvi: ${srcdir}/ada-mode.texi
 ada-mode.pdf: ${srcdir}/ada-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
 
-auth : $(infodir)/auth
-$(infodir)/auth: auth.texi
+auth : $(buildinfodir)/auth
+$(buildinfodir)/auth: auth.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
 auth.dvi: ${srcdir}/auth.texi
@@ -248,8 +248,8 @@ auth.dvi: ${srcdir}/auth.texi
 auth.pdf: ${srcdir}/auth.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
 
-autotype : $(infodir)/autotype
-$(infodir)/autotype: autotype.texi
+autotype : $(buildinfodir)/autotype
+$(buildinfodir)/autotype: autotype.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
 autotype.dvi: ${srcdir}/autotype.texi
@@ -257,8 +257,8 @@ autotype.dvi: ${srcdir}/autotype.texi
 autotype.pdf: ${srcdir}/autotype.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
 
-calc : $(infodir)/calc
-$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
+calc : $(buildinfodir)/calc
+$(buildinfodir)/calc: calc.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
 calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
@@ -266,8 +266,8 @@ calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
 calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
 
-ccmode : $(infodir)/ccmode
-$(infodir)/ccmode: cc-mode.texi
+ccmode : $(buildinfodir)/ccmode
+$(buildinfodir)/ccmode: cc-mode.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
 cc-mode.dvi: ${srcdir}/cc-mode.texi
@@ -275,8 +275,8 @@ cc-mode.dvi: ${srcdir}/cc-mode.texi
 cc-mode.pdf: ${srcdir}/cc-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
 
-cl : $(infodir)/cl
-$(infodir)/cl: cl.texi
+cl : $(buildinfodir)/cl
+$(buildinfodir)/cl: cl.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
 cl.dvi: ${srcdir}/cl.texi
@@ -284,8 +284,8 @@ cl.dvi: ${srcdir}/cl.texi
 cl.pdf: ${srcdir}/cl.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
 
-dbus : $(infodir)/dbus
-$(infodir)/dbus: dbus.texi
+dbus : $(buildinfodir)/dbus
+$(buildinfodir)/dbus: dbus.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
 dbus.dvi: ${srcdir}/dbus.texi
@@ -293,8 +293,8 @@ dbus.dvi: ${srcdir}/dbus.texi
 dbus.pdf: ${srcdir}/dbus.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
 
-dired-x : $(infodir)/dired-x
-$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
+dired-x : $(buildinfodir)/dired-x
+$(buildinfodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
 dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
@@ -302,8 +302,8 @@ dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
 dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
 
-ebrowse : $(infodir)/ebrowse
-$(infodir)/ebrowse: ebrowse.texi
+ebrowse : $(buildinfodir)/ebrowse
+$(buildinfodir)/ebrowse: ebrowse.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
 ebrowse.dvi: ${srcdir}/ebrowse.texi
@@ -311,8 +311,8 @@ ebrowse.dvi: ${srcdir}/ebrowse.texi
 ebrowse.pdf: ${srcdir}/ebrowse.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
 
-ede : $(infodir)/ede
-$(infodir)/ede: ede.texi
+ede : $(buildinfodir)/ede
+$(buildinfodir)/ede: ede.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi
 ede.dvi: ${srcdir}/ede.texi
@@ -320,8 +320,8 @@ ede.dvi: ${srcdir}/ede.texi
 ede.pdf: ${srcdir}/ede.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
 
-ediff : $(infodir)/ediff
-$(infodir)/ediff: ediff.texi
+ediff : $(buildinfodir)/ediff
+$(buildinfodir)/ediff: ediff.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
 ediff.dvi: ${srcdir}/ediff.texi
@@ -329,8 +329,8 @@ ediff.dvi: ${srcdir}/ediff.texi
 ediff.pdf: ${srcdir}/ediff.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
 
-edt : $(infodir)/edt
-$(infodir)/edt: edt.texi
+edt : $(buildinfodir)/edt
+$(buildinfodir)/edt: edt.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
 edt.dvi: ${srcdir}/edt.texi
@@ -338,8 +338,8 @@ edt.dvi: ${srcdir}/edt.texi
 edt.pdf: ${srcdir}/edt.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
 
-eieio : $(infodir)/eieio
-$(infodir)/eieio: eieio.texi
+eieio : $(buildinfodir)/eieio
+$(buildinfodir)/eieio: eieio.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi
 eieio.dvi: ${srcdir}/eieio.texi
@@ -347,8 +347,8 @@ eieio.dvi: ${srcdir}/eieio.texi
 eieio.pdf: ${srcdir}/eieio.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
 
-emacs-gnutls : $(infodir)/emacs-gnutls
-$(infodir)/emacs-gnutls: emacs-gnutls.texi
+emacs-gnutls : $(buildinfodir)/emacs-gnutls
+$(buildinfodir)/emacs-gnutls: emacs-gnutls.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi
 emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi
@@ -356,8 +356,8 @@ emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi
 emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
 
-emacs-mime : $(infodir)/emacs-mime
-$(infodir)/emacs-mime: emacs-mime.texi
+emacs-mime : $(buildinfodir)/emacs-mime
+$(buildinfodir)/emacs-mime: emacs-mime.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
 emacs-mime.dvi: ${srcdir}/emacs-mime.texi
@@ -365,8 +365,8 @@ emacs-mime.dvi: ${srcdir}/emacs-mime.texi
 emacs-mime.pdf: ${srcdir}/emacs-mime.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
 
-epa : $(infodir)/epa
-$(infodir)/epa: epa.texi
+epa : $(buildinfodir)/epa
+$(buildinfodir)/epa: epa.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi
 epa.dvi: ${srcdir}/epa.texi
@@ -374,8 +374,8 @@ epa.dvi: ${srcdir}/epa.texi
 epa.pdf: ${srcdir}/epa.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
 
-erc : $(infodir)/erc
-$(infodir)/erc: erc.texi
+erc : $(buildinfodir)/erc
+$(buildinfodir)/erc: erc.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
 erc.dvi: ${srcdir}/erc.texi
@@ -383,8 +383,8 @@ erc.dvi: ${srcdir}/erc.texi
 erc.pdf: ${srcdir}/erc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
 
-ert : $(infodir)/ert
-$(infodir)/ert: ert.texi
+ert : $(buildinfodir)/ert
+$(buildinfodir)/ert: ert.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi
 ert.dvi: ${srcdir}/ert.texi
@@ -392,8 +392,8 @@ ert.dvi: ${srcdir}/ert.texi
 ert.pdf: ${srcdir}/ert.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
 
-eshell : $(infodir)/eshell
-$(infodir)/eshell: eshell.texi
+eshell : $(buildinfodir)/eshell
+$(buildinfodir)/eshell: eshell.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
 eshell.dvi: ${srcdir}/eshell.texi
@@ -401,8 +401,8 @@ eshell.dvi: ${srcdir}/eshell.texi
 eshell.pdf: ${srcdir}/eshell.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
 
-eudc : $(infodir)/eudc
-$(infodir)/eudc: eudc.texi
+eudc : $(buildinfodir)/eudc
+$(buildinfodir)/eudc: eudc.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
 eudc.dvi: ${srcdir}/eudc.texi
@@ -410,8 +410,8 @@ eudc.dvi: ${srcdir}/eudc.texi
 eudc.pdf: ${srcdir}/eudc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
 
-efaq : $(infodir)/efaq
-$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
+efaq : $(buildinfodir)/efaq
+$(buildinfodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) faq.texi
 faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
@@ -428,8 +428,8 @@ emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
 emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
 	$(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
 
-flymake : $(infodir)/flymake
-$(infodir)/flymake: flymake.texi
+flymake : $(buildinfodir)/flymake
+$(buildinfodir)/flymake: flymake.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
 flymake.dvi: ${srcdir}/flymake.texi
@@ -437,8 +437,8 @@ flymake.dvi: ${srcdir}/flymake.texi
 flymake.pdf: ${srcdir}/flymake.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
 
-forms : $(infodir)/forms
-$(infodir)/forms: forms.texi
+forms : $(buildinfodir)/forms
+$(buildinfodir)/forms: forms.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
 forms.dvi: ${srcdir}/forms.texi
@@ -447,8 +447,8 @@ forms.pdf: ${srcdir}/forms.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
-gnus : $(infodir)/gnus
-$(infodir)/gnus: gnus.texi gnus-faq.texi
+gnus : $(buildinfodir)/gnus
+$(buildinfodir)/gnus: gnus.texi gnus-faq.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
 gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi
@@ -464,8 +464,8 @@ gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi
 
 # This is produced with --no-split to avoid making files whose
 # names clash on DOS 8+3 filesystems
-idlwave : $(infodir)/idlwave
-$(infodir)/idlwave: idlwave.texi
+idlwave : $(buildinfodir)/idlwave
+$(buildinfodir)/idlwave: idlwave.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
 idlwave.dvi: ${srcdir}/idlwave.texi
@@ -476,8 +476,8 @@ idlwave.pdf: ${srcdir}/idlwave.texi
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
-###info : $(infodir)/info   # circular!
-$(infodir)/info: info.texi
+###info : $(buildinfodir)/info   # circular!
+$(buildinfodir)/info: info.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi
 info.dvi: ${srcdir}/info.texi
@@ -485,8 +485,8 @@ info.dvi: ${srcdir}/info.texi
 info.pdf: ${srcdir}/info.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
 
-mairix-el : $(infodir)/mairix-el
-$(infodir)/mairix-el: mairix-el.texi
+mairix-el : $(buildinfodir)/mairix-el
+$(buildinfodir)/mairix-el: mairix-el.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi
 mairix-el.dvi: ${srcdir}/mairix-el.texi
@@ -494,8 +494,8 @@ mairix-el.dvi: ${srcdir}/mairix-el.texi
 mairix-el.pdf: ${srcdir}/mairix-el.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
 
-message : $(infodir)/message
-$(infodir)/message: message.texi
+message : $(buildinfodir)/message
+$(buildinfodir)/message: message.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) message.texi
 message.dvi: ${srcdir}/message.texi
@@ -503,8 +503,8 @@ message.dvi: ${srcdir}/message.texi
 message.pdf: ${srcdir}/message.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
 
-mh-e : $(infodir)/mh-e
-$(infodir)/mh-e: mh-e.texi
+mh-e : $(buildinfodir)/mh-e
+$(buildinfodir)/mh-e: mh-e.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
 mh-e.dvi: ${srcdir}/mh-e.texi
@@ -512,8 +512,8 @@ mh-e.dvi: ${srcdir}/mh-e.texi
 mh-e.pdf: ${srcdir}/mh-e.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
 
-newsticker : $(infodir)/newsticker
-$(infodir)/newsticker: newsticker.texi
+newsticker : $(buildinfodir)/newsticker
+$(buildinfodir)/newsticker: newsticker.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
 newsticker.dvi: ${srcdir}/newsticker.texi
@@ -521,8 +521,8 @@ newsticker.dvi: ${srcdir}/newsticker.texi
 newsticker.pdf: ${srcdir}/newsticker.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
 
-nxml-mode : $(infodir)/nxml-mode
-$(infodir)/nxml-mode: nxml-mode.texi
+nxml-mode : $(buildinfodir)/nxml-mode
+$(buildinfodir)/nxml-mode: nxml-mode.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi
 nxml-mode.dvi: ${srcdir}/nxml-mode.texi
@@ -530,8 +530,8 @@ nxml-mode.dvi: ${srcdir}/nxml-mode.texi
 nxml-mode.pdf: ${srcdir}/nxml-mode.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
 
-org : $(infodir)/org
-$(infodir)/org: org.texi
+org : $(buildinfodir)/org
+$(buildinfodir)/org: org.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) org.texi
 org.dvi: ${srcdir}/org.texi
@@ -539,8 +539,8 @@ org.dvi: ${srcdir}/org.texi
 org.pdf: ${srcdir}/org.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
 
-pcl-cvs : $(infodir)/pcl-cvs
-$(infodir)/pcl-cvs: pcl-cvs.texi
+pcl-cvs : $(buildinfodir)/pcl-cvs
+$(buildinfodir)/pcl-cvs: pcl-cvs.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
 pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
@@ -548,8 +548,8 @@ pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
 pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
 
-pgg : $(infodir)/pgg
-$(infodir)/pgg: pgg.texi
+pgg : $(buildinfodir)/pgg
+$(buildinfodir)/pgg: pgg.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
 pgg.dvi: ${srcdir}/pgg.texi
@@ -557,8 +557,8 @@ pgg.dvi: ${srcdir}/pgg.texi
 pgg.pdf: ${srcdir}/pgg.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
 
-rcirc : $(infodir)/rcirc
-$(infodir)/rcirc: rcirc.texi
+rcirc : $(buildinfodir)/rcirc
+$(buildinfodir)/rcirc: rcirc.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
 rcirc.dvi: ${srcdir}/rcirc.texi
@@ -566,8 +566,8 @@ rcirc.dvi: ${srcdir}/rcirc.texi
 rcirc.pdf: ${srcdir}/rcirc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
 
-reftex : $(infodir)/reftex
-$(infodir)/reftex: reftex.texi
+reftex : $(buildinfodir)/reftex
+$(buildinfodir)/reftex: reftex.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
 reftex.dvi: ${srcdir}/reftex.texi
@@ -575,8 +575,8 @@ reftex.dvi: ${srcdir}/reftex.texi
 reftex.pdf: ${srcdir}/reftex.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
 
-remember : $(infodir)/remember
-$(infodir)/remember: remember.texi
+remember : $(buildinfodir)/remember
+$(buildinfodir)/remember: remember.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
 remember.dvi: ${srcdir}/remember.texi
@@ -584,8 +584,8 @@ remember.dvi: ${srcdir}/remember.texi
 remember.pdf: ${srcdir}/remember.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
 
-sasl : $(infodir)/sasl
-$(infodir)/sasl: sasl.texi
+sasl : $(buildinfodir)/sasl
+$(buildinfodir)/sasl: sasl.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
 sasl.dvi: ${srcdir}/sasl.texi
@@ -593,8 +593,8 @@ sasl.dvi: ${srcdir}/sasl.texi
 sasl.pdf: ${srcdir}/sasl.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
 
-sc : $(infodir)/sc
-$(infodir)/sc: sc.texi
+sc : $(buildinfodir)/sc
+$(buildinfodir)/sc: sc.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
 sc.dvi: ${srcdir}/sc.texi
@@ -602,8 +602,8 @@ sc.dvi: ${srcdir}/sc.texi
 sc.pdf: ${srcdir}/sc.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
 
-semantic : $(infodir)/semantic
-$(infodir)/semantic: semantic.texi sem-user.texi
+semantic : $(buildinfodir)/semantic
+$(buildinfodir)/semantic: semantic.texi sem-user.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
 semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
@@ -611,8 +611,8 @@ semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
 semantic.pdf: ${srcdir}/semantic.texi sem-user.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
 
-ses : $(infodir)/ses
-$(infodir)/ses: ses.texi
+ses : $(buildinfodir)/ses
+$(buildinfodir)/ses: ses.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
 ses.dvi: ${srcdir}/ses.texi
@@ -620,8 +620,8 @@ ses.dvi: ${srcdir}/ses.texi
 ses.pdf: ${srcdir}/ses.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
 
-sieve : $(infodir)/sieve
-$(infodir)/sieve: sieve.texi
+sieve : $(buildinfodir)/sieve
+$(buildinfodir)/sieve: sieve.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
 sieve.dvi: ${srcdir}/sieve.texi
@@ -629,8 +629,8 @@ sieve.dvi: ${srcdir}/sieve.texi
 sieve.pdf: ${srcdir}/sieve.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
 
-smtpmail : $(infodir)/smtpmail
-$(infodir)/smtpmail: smtpmail.texi
+smtpmail : $(buildinfodir)/smtpmail
+$(buildinfodir)/smtpmail: smtpmail.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
 smtpmail.dvi: ${srcdir}/smtpmail.texi
@@ -638,8 +638,8 @@ smtpmail.dvi: ${srcdir}/smtpmail.texi
 smtpmail.pdf: ${srcdir}/smtpmail.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
 
-speedbar : $(infodir)/speedbar
-$(infodir)/speedbar: speedbar.texi
+speedbar : $(buildinfodir)/speedbar
+$(buildinfodir)/speedbar: speedbar.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
 speedbar.dvi: ${srcdir}/speedbar.texi
@@ -647,8 +647,8 @@ speedbar.dvi: ${srcdir}/speedbar.texi
 speedbar.pdf: ${srcdir}/speedbar.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
 
-tramp : $(infodir)/tramp
-$(infodir)/tramp: tramp.texi trampver.texi
+tramp : $(buildinfodir)/tramp
+$(buildinfodir)/tramp: tramp.texi trampver.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs tramp.texi
 tramp.dvi: ${srcdir}/tramp.texi trampver.texi
@@ -656,8 +656,8 @@ tramp.dvi: ${srcdir}/tramp.texi trampver.texi
 tramp.pdf: ${srcdir}/tramp.texi trampver.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
 
-url : $(infodir)/url
-$(infodir)/url: url.texi
+url : $(buildinfodir)/url
+$(buildinfodir)/url: url.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) url.texi
 url.dvi: ${srcdir}/url.texi
@@ -665,8 +665,8 @@ url.dvi: ${srcdir}/url.texi
 url.pdf: ${srcdir}/url.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
 
-vip : $(infodir)/vip
-$(infodir)/vip: vip.texi
+vip : $(buildinfodir)/vip
+$(buildinfodir)/vip: vip.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
 vip.dvi: ${srcdir}/vip.texi
@@ -674,8 +674,8 @@ vip.dvi: ${srcdir}/vip.texi
 vip.pdf: ${srcdir}/vip.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
 
-viper : $(infodir)/viper
-$(infodir)/viper: viper.texi
+viper : $(buildinfodir)/viper
+$(buildinfodir)/viper: viper.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
 viper.dvi: ${srcdir}/viper.texi
@@ -683,8 +683,8 @@ viper.dvi: ${srcdir}/viper.texi
 viper.pdf: ${srcdir}/viper.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
 
-widget : $(infodir)/widget
-$(infodir)/widget: widget.texi
+widget : $(buildinfodir)/widget
+$(buildinfodir)/widget: widget.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
 widget.dvi: ${srcdir}/widget.texi
@@ -692,8 +692,8 @@ widget.dvi: ${srcdir}/widget.texi
 widget.pdf: ${srcdir}/widget.texi
 	$(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
 
-woman : $(infodir)/woman
-$(infodir)/woman: woman.texi
+woman : $(buildinfodir)/woman
+$(buildinfodir)/woman: woman.texi
 	$(mkinfodir)
 	cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
 woman.dvi: ${srcdir}/woman.texi
@@ -715,7 +715,7 @@ clean: mostlyclean
 distclean: clean
 #	rm -f Makefile
 
-## infodir is relative to srcdir.
+## buildinfodir is relative to srcdir.
 maintainer-clean: distclean
 	cd $(srcdir); for file in $(INFO_TARGETS); do \
 	  rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \