Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org

diff --cc doc/emacs/ChangeLog
index 7460d0f4aade06f04de273f69e24b3716b37ee15,ca649f70b0c958458a10d6bf631a6ea8307567e8..09dbeebe8080c18a9ffa6ec7181891f676313816
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,6 -1,14 +1,10 @@@
 -2012-06-19  Glenn Morris  <rgm@gnu.org>
++2012-06-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+ 
 -2012-06-11  Chong Yidong  <cyd@gnu.org>
 +2012-06-17  Chong Yidong  <cyd@gnu.org>
  
 -      * emacs.texi: Remove urlcolor setting.
 -
 -2012-06-10  Chong Yidong  <cyd@gnu.org>
 -
 -      * emacs.texi: Update ISBN and edition number.
 +      * emacs.texi: Remove urlcolor setting.  Update ISBN and edition number.
  
        * anti.texi:
        * building.texi:

diff --cc doc/emacs/Makefile.in
index 7ffbf52e94fcf3ad588fa7040aac4732a4ad647c,a516e75be67b9459cbfa8e362ba642d58fe457af..8f2078192b2c6c8312306fe23c7dc8762afca8e6
--- 1/doc/emacs/Makefile.in
--- 2/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@@ -120,12 -111,14 +120,12 @@@ EMACSSOURCES= 
        $(EMACS_XTRA)
  
  ## This seems pointless.  The info/ directory exists in both the
 -## 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 ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
 +## repository and the release tarfiles.
- mkinfodir = @${MKDIR_P} ${infodir}
++mkinfodir = @${MKDIR_P} ${buildinfodir}
  
  .PHONY: info dvi html pdf ps
  
- info: $(infodir)/emacs$(INFO_EXT)
 -info: $(buildinfodir)/emacs
++info: $(buildinfodir)/emacs$(INFO_EXT)
  dvi: emacs.dvi
  html: emacs.html
  pdf: emacs.pdf
@@@ -135,9 -128,9 +135,9 @@@ ps: emacs.p
  # 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$(INFO_EXT): ${EMACSSOURCES}
 -$(buildinfodir)/emacs: ${EMACSSOURCES}
++$(buildinfodir)/emacs$(INFO_EXT): ${EMACSSOURCES}
        $(mkinfodir)
 -      $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi
  
  emacs.dvi: ${EMACSSOURCES}
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
@@@ -178,7 -171,7 +178,7 @@@ distclean: clea
  
  ## In the standalone tarfile, the clean rule runs this.
  infoclean:
-       -cd $(infodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9]
 -      -cd $(buildinfodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9]
++      -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9]
  
  maintainer-clean: distclean infoclean
  

diff --cc doc/lispintro/ChangeLog
index af84726af810270f57ebac735eee526ab246ea67,0cf74ae5878aafb0bb9c83180fdc51e413d45b86..0ec9cb6d726291d30e68e18fc84df04576a2a1f8
--- 1/doc/lispintro/ChangeLog
--- 2/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@@ -1,14 -1,12 +1,18 @@@
 -2012-06-19  Glenn Morris  <rgm@gnu.org>
++2012-06-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+ 
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +2012-05-29  Glenn Morris  <rgm@gnu.org>
  
 -      * Version 24.1 released.
 +      * emacs-lisp-intro.texi: Nuke hand-written node pointers.
 +      (dolist, dotimes): Fix sectioning.
  
 -2012-05-04  Glenn Morris  <rgm@gnu.org>
 +2012-05-12  Glenn Morris  <rgm@gnu.org>
 +
 +      * Makefile.in (MKDIR_P): New, set by configure.
 +      (mkinfodir): Use $MKDIR_P.
 +
 +2012-05-05  Glenn Morris  <rgm@gnu.org>
  
        * emacs-lisp-intro.texi (Making Errors): Don't mention Emacs 20.
        (Void Function, Wrong Type of Argument, Recursion with list)

diff --cc doc/lispintro/Makefile.in
index bf10e5c73b7f6b4b03ecdaff6a246ffcc8cba906,df5248dff3d78854d970fd37495fea5433d6993f..3f2fe1f9526285d81ab9404e1429ba4d84dea515
--- 1/doc/lispintro/Makefile.in
--- 2/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@@ -41,11 -35,11 +41,11 @@@ DVIPS = dvip
  ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
           MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
  
- mkinfodir = @${MKDIR_P} ${infodir}
 -mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
++mkinfodir = @${MKDIR_P} ${buildinfodir}
  
  .PHONY: info dvi html pdf ps
  
- info: ${infodir}/eintr$(INFO_EXT)
 -info: ${buildinfodir}/eintr
++info: ${buildinfodir}/eintr$(INFO_EXT)
  
  dvi: emacs-lisp-intro.dvi
  html: emacs-lisp-intro.html
@@@ -55,9 -49,9 +55,9 @@@ ps: emacs-lisp-intro.p
  # 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$(INFO_EXT): ${srcdir}/emacs-lisp-intro.texi
 -${buildinfodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
++${buildinfodir}/eintr$(INFO_EXT): ${srcdir}/emacs-lisp-intro.texi
        $(mkinfodir)
 -      $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi
  
  emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi
@@@ -85,7 -79,7 +85,7 @@@ clean: mostlyclea
  distclean: clean
  
  infoclean:
-       -cd $(infodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9]
 -      -cd $(buildinfodir) && rm -f eintr eintr-[1-9]
++      -cd $(buildinfodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9]
  
  maintainer-clean: distclean infoclean
  

diff --cc doc/lispref/ChangeLog
index 89efb5c62554fe666ccdb9ff3d1ba7fa4c4b925a,ed9aab245eabb53dc1160c5fd36b146edb2f390b..91c3617cff8fc0db66fc1edbae0691bacca44040
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,74 -1,21 +1,78 @@@
 -2012-06-19  Glenn Morris  <rgm@gnu.org>
++2012-06-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+ 
 +2012-06-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * functions.texi (Defining Functions):
 +      * macros.texi (Defining Macros): Un-define the return value of `defun',
 +      `defmacro' and `defalias'.
 +
 +2012-06-17  Chong Yidong  <cyd@gnu.org>
 +
 +      * elisp.texi: Remove urlcolor setting.
 +
 +2012-06-17  Glenn Morris  <rgm@gnu.org>
 +
 +      * display.texi (Face Attributes): Copyedits.  Add a few cindex entries.
 +      Overlining no longer behaves exactly like underlining.
 +
 +2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 +
 +      * display.texi (Face Attributes):
 +      Document wave-style underline face attribute.
 +
  2012-06-11  Chong Yidong  <cyd@gnu.org>
  
 -      * elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting.
 +      * display.texi (ImageMagick Images): ImageMagick now supports the
 +      :background property.
 +
 +2012-06-10  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * internals.texi (Garbage Collection): Typo fix.
  
 -      * vol2.texi: Include package.texi.
 +2012-06-09  Chong Yidong  <cyd@gnu.org>
  
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +      * text.texi (Special Properties): Clarify the meaning of a list of
 +      faces in the `face' property.
  
 -      * Version 24.1 released.
 +      * display.texi (Face Remapping): Minor clarification.
  
 -2012-05-15  Chong Yidong  <cyd@gnu.org>
 +2012-06-08  Chong Yidong  <cyd@gnu.org>
  
 -      * functions.texi (Obsolete Functions): Fix doc for
 -      set-advertised-calling-convention.
 +      * display.texi (Face Attributes): Font family does not accept
 +      wildcards.  De-document obsolete :bold and :italic attributes.
 +      (Defining Faces): Use new-style face spec format.
 +
 +2012-06-08  Dmitry Antipov  <dmantipov@yandex.ru>
 +
 +      * internals.text (Garbage Collection): Document new
 +      vector management code and vectorlike_header structure.
 +
 +2012-06-03  Chong Yidong  <cyd@gnu.org>
 +
 +      * modes.texi (Mode Line Data): Use "mode line construct"
 +      terminology for consistency.
 +
 +2012-05-27  Glenn Morris  <rgm@gnu.org>
 +
 +      * abbrevs.texi, advice.texi, anti.texi, backups.texi:
 +      * buffers.texi, commands.texi, compile.texi, control.texi:
 +      * customize.texi, debugging.texi, display.texi, doclicense.texi:
 +      * edebug.texi, elisp.texi, errors.texi, eval.texi, files.texi:
 +      * frames.texi, functions.texi, gpl.texi, hash.texi, help.texi:
 +      * hooks.texi, index.texi, internals.texi, intro.texi, keymaps.texi:
 +      * lists.texi, loading.texi, macros.texi, maps.texi, markers.texi:
 +      * minibuf.texi, modes.texi, nonascii.texi, numbers.texi:
 +      * objects.texi, os.texi, package.texi, positions.texi:
 +      * processes.texi, searching.texi, sequences.texi, streams.texi:
 +      * strings.texi, symbols.texi, syntax.texi, text.texi, tips.texi:
 +      * variables.texi, windows.texi: Nuke hand-written node pointers.
 +
 +2012-05-27  Chong Yidong  <cyd@gnu.org>
 +
 +      * functions.texi (Obsolete Functions):
 +      Fix doc for set-advertised-calling-convention.
  
        * modes.texi (Mode Help): Fix describe-mode.
  

diff --cc doc/lispref/Makefile.in
index dd820d85133d9aeb98464afc1a62bd30b68682a8,dafe5bc896476ea58ba9b93a922da53ca6895c84..32a241e2a2dc09c74f00290b166130896d0feef5
--- 1/doc/lispref/Makefile.in
--- 2/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@@ -101,20 -96,20 +101,20 @@@ srcs = 
    $(srcdir)/gpl.texi \
    $(srcdir)/doclicense.texi
  
- mkinfodir = @${MKDIR_P} ${infodir}
 -mkinfodir = @test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
++mkinfodir = @${MKDIR_P} ${buildinfodir}
  
  .PHONY: info dvi pdf ps
  
- info: $(infodir)/elisp$(INFO_EXT)
 -info: $(buildinfodir)/elisp
++info: $(buildinfodir)/elisp$(INFO_EXT)
  dvi: elisp.dvi
  html: elisp.html
  pdf: elisp.pdf
  ps: elisp.ps
  
  ## Note: "<" is not portable in ordinary make rules.
- $(infodir)/elisp$(INFO_EXT): $(srcs)
 -$(buildinfodir)/elisp: $(srcs)
++$(buildinfodir)/elisp$(INFO_EXT): $(srcs)
        $(mkinfodir)
 -      $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $(srcdir)/elisp.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
  
  elisp.dvi: $(srcs)
        $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi
@@@ -145,7 -140,7 +145,7 @@@ clean: mostlyclea
  distclean: clean
  
  infoclean:
-       -cd $(infodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9]
 -      -cd $(buildinfodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
++      -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9]
  
  maintainer-clean: distclean infoclean
  

diff --cc doc/misc/ChangeLog
index 1026215a46bb30eebde3999df475f40edaf381c1,389e937932bb7d47d918762b5bd97208de8acafa..212343f4c67e440d16c5f3884df29b22d8117dc8
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,28 -1,12 +1,32 @@@
 -2012-06-19  Glenn Morris  <rgm@gnu.org>
++2012-06-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)
+ 
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +2012-06-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 -      * Version 24.1 released.
 +      * gnus.texi (Group Timestamp): Mention where to find documentation for
 +      the `gnus-tmp-' variables (bug#11601).
  
 -2012-06-01  Chong Yidong  <cyd@gnu.org>
 +2012-06-11  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      Sync with Tramp 2.2.6-pre.
 +
 +      * tramp.texi (all): Use consequently @command{}, @env{} and @kbd{}
 +      where appropriate.
 +      (Ad-hoc multi-hops): New section.
 +      (Remote processes): New subsection "Running remote processes on
 +      Windows hosts".
 +      (History): Add remote commands on Windows, and ad-hoc multi-hop
 +      methods.
 +      (External methods): "ControlPersist" must be set to "no" for the
 +      `scpc' method.
 +      (Remote processes): Add a note about `auto-revert-tail-mode'.
 +      (Frequently Asked Questions): Use "scpx" in combination with
 +      "ControlPersist".  Reported by Adam Spiers <emacs@adamspiers.org>.
 +
 +      * trampver.texi: Update release number.
 +
 +2012-06-10  Chong Yidong  <cyd@gnu.org>
  
        * sc.texi: Remove bogus @ifinfo commands which prevent makeinfo
        compilation for html-mono.

diff --cc doc/misc/Makefile.in
index c275a16a9a63579b6843f8941fe3afa3ae511e70,dd8cf4b9014abf0d820bb173b558624b26049b05..c42a10b88bcc454298e241e4282bc8c4280ba0aa
--- 1/doc/misc/Makefile.in
--- 2/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@@ -24,8 -24,16 +24,8 @@@ SHELL = /bin/s
  # set by the configure script's `--srcdir' option.
  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 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.
- infodir = $(srcdir)/../../info
 -## Note that the setfilename command in the .texi files assumes this.
 -buildinfodir=../../info
++buildinfodir = $(srcdir)/../../info
  ## Directory with emacsver.texi.
  ## Currently only used by efaq and calc.
  emacsdir = $(srcdir)/../emacs
@@@ -162,21 -208,12 +162,21 @@@ TEXI2PDF = texi2pd
  ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \
           MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
  
- mkinfodir = @${MKDIR_P} ${infodir}
 -mkinfodir = @cd ${srcdir}; test -d ${buildinfodir} || mkdir ${buildinfodir} || test -d ${buildinfodir}
++mkinfodir = @${MKDIR_P} ${buildinfodir}
  
 -.PHONY: info dvi pdf
 +.PHONY: info dvi pdf echo-info
 +## Prevent implicit rule triggering for foo.info.
 +.SUFFIXES:
  
 +# Default.
  info: $(INFO_TARGETS)
  
 +## Used by top-level Makefile.
 +## Base file names of output info files.
 +echo-info:
 +      @echo "$(INFO_TARGETS) " | \
 +        sed -e 's|[^ ]*/||g' -e 's/\.info//g' -e "s/  */$(INFO_EXT) /g"
 +
  # please modify this for all the web manual targets
  webhack: clean
        $(MAKE) pdf MAKEINFO_OPTS="-DWEBHACKDEVEL $(MAKEINFO_OPTS)"
@@@ -191,190 -229,191 +191,190 @@@ pdf: $(PDF_TARGETS
  
  # Note: "<" is not portable in ordinary make rules.
  
- ada-mode : $(infodir)/ada-mode$(INFO_EXT)
- $(infodir)/ada-mode$(INFO_EXT): ${srcdir}/ada-mode.texi
 -## "short" target names for convenience, to just rebuild one manual.
 -ada-mode : $(buildinfodir)/ada-mode
 -$(buildinfodir)/ada-mode: ada-mode.texi
++ada-mode : $(buildinfodir)/ada-mode$(INFO_EXT)
++$(buildinfodir)/ada-mode$(INFO_EXT): ${srcdir}/ada-mode.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ada-mode.texi
  ada-mode.dvi: ${srcdir}/ada-mode.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
  ada-mode.pdf: ${srcdir}/ada-mode.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi
  
- auth : $(infodir)/auth$(INFO_EXT)
- $(infodir)/auth$(INFO_EXT): ${srcdir}/auth.texi
 -auth : $(buildinfodir)/auth
 -$(buildinfodir)/auth: auth.texi
++auth : $(buildinfodir)/auth$(INFO_EXT)
++$(buildinfodir)/auth$(INFO_EXT): ${srcdir}/auth.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/auth.texi
  auth.dvi: ${srcdir}/auth.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi
  auth.pdf: ${srcdir}/auth.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi
  
- autotype : $(infodir)/autotype$(INFO_EXT)
- $(infodir)/autotype$(INFO_EXT): ${srcdir}/autotype.texi
 -autotype : $(buildinfodir)/autotype
 -$(buildinfodir)/autotype: autotype.texi
++autotype : $(buildinfodir)/autotype$(INFO_EXT)
++$(buildinfodir)/autotype$(INFO_EXT): ${srcdir}/autotype.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/autotype.texi
  autotype.dvi: ${srcdir}/autotype.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
  autotype.pdf: ${srcdir}/autotype.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi
  
- calc : $(infodir)/calc$(INFO_EXT)
- $(infodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
 -calc : $(buildinfodir)/calc
 -$(buildinfodir)/calc: calc.texi $(emacsdir)/emacsver.texi
++calc : $(buildinfodir)/calc$(INFO_EXT)
++$(buildinfodir)/calc$(INFO_EXT): ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/calc.texi
  calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
  calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi
  
- ccmode : $(infodir)/ccmode$(INFO_EXT)
- $(infodir)/ccmode$(INFO_EXT): ${srcdir}/cc-mode.texi
 -ccmode : $(buildinfodir)/ccmode
 -$(buildinfodir)/ccmode: cc-mode.texi
++ccmode : $(buildinfodir)/ccmode$(INFO_EXT)
++$(buildinfodir)/ccmode$(INFO_EXT): ${srcdir}/cc-mode.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cc-mode.texi
  cc-mode.dvi: ${srcdir}/cc-mode.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
  cc-mode.pdf: ${srcdir}/cc-mode.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi
  
- cl : $(infodir)/cl$(INFO_EXT)
- $(infodir)/cl$(INFO_EXT): ${srcdir}/cl.texi
 -cl : $(buildinfodir)/cl
 -$(buildinfodir)/cl: cl.texi
++cl : $(buildinfodir)/cl$(INFO_EXT)
++$(buildinfodir)/cl$(INFO_EXT): ${srcdir}/cl.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/cl.texi
  cl.dvi: ${srcdir}/cl.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
  cl.pdf: ${srcdir}/cl.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi
  
- dbus : $(infodir)/dbus$(INFO_EXT)
- $(infodir)/dbus$(INFO_EXT): ${srcdir}/dbus.texi
 -dbus : $(buildinfodir)/dbus
 -$(buildinfodir)/dbus: dbus.texi
++dbus : $(buildinfodir)/dbus$(INFO_EXT)
++$(buildinfodir)/dbus$(INFO_EXT): ${srcdir}/dbus.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dbus.texi
  dbus.dvi: ${srcdir}/dbus.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi
  dbus.pdf: ${srcdir}/dbus.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi
  
- dired-x : $(infodir)/dired-x$(INFO_EXT)
- $(infodir)/dired-x$(INFO_EXT): ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
 -dired-x : $(buildinfodir)/dired-x
 -$(buildinfodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi
++dired-x : $(buildinfodir)/dired-x$(INFO_EXT)
++$(buildinfodir)/dired-x$(INFO_EXT): ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/dired-x.texi
  dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
  dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi
  
- ebrowse : $(infodir)/ebrowse$(INFO_EXT)
- $(infodir)/ebrowse$(INFO_EXT): ${srcdir}/ebrowse.texi
 -ebrowse : $(buildinfodir)/ebrowse
 -$(buildinfodir)/ebrowse: ebrowse.texi
++ebrowse : $(buildinfodir)/ebrowse$(INFO_EXT)
++$(buildinfodir)/ebrowse$(INFO_EXT): ${srcdir}/ebrowse.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ebrowse.texi
  ebrowse.dvi: ${srcdir}/ebrowse.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
  ebrowse.pdf: ${srcdir}/ebrowse.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi
  
- ede : $(infodir)/ede$(INFO_EXT)
- $(infodir)/ede$(INFO_EXT): ${srcdir}/ede.texi
 -ede : $(buildinfodir)/ede
 -$(buildinfodir)/ede: ede.texi
++ede : $(buildinfodir)/ede$(INFO_EXT)
++$(buildinfodir)/ede$(INFO_EXT): ${srcdir}/ede.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ede.texi
  ede.dvi: ${srcdir}/ede.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi
  ede.pdf: ${srcdir}/ede.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi
  
- ediff : $(infodir)/ediff$(INFO_EXT)
- $(infodir)/ediff$(INFO_EXT): ${srcdir}/ediff.texi
 -ediff : $(buildinfodir)/ediff
 -$(buildinfodir)/ediff: ediff.texi
++ediff : $(buildinfodir)/ediff$(INFO_EXT)
++$(buildinfodir)/ediff$(INFO_EXT): ${srcdir}/ediff.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ediff.texi
  ediff.dvi: ${srcdir}/ediff.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
  ediff.pdf: ${srcdir}/ediff.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
  
- edt : $(infodir)/edt$(INFO_EXT)
- $(infodir)/edt$(INFO_EXT): ${srcdir}/edt.texi
 -edt : $(buildinfodir)/edt
 -$(buildinfodir)/edt: edt.texi
++edt : $(buildinfodir)/edt$(INFO_EXT)
++$(buildinfodir)/edt$(INFO_EXT): ${srcdir}/edt.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/edt.texi
  edt.dvi: ${srcdir}/edt.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi
  edt.pdf: ${srcdir}/edt.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi
  
- eieio : $(infodir)/eieio$(INFO_EXT)
- $(infodir)/eieio$(INFO_EXT): ${srcdir}/eieio.texi
 -eieio : $(buildinfodir)/eieio
 -$(buildinfodir)/eieio: eieio.texi
++eieio : $(buildinfodir)/eieio$(INFO_EXT)
++$(buildinfodir)/eieio$(INFO_EXT): ${srcdir}/eieio.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eieio.texi
  eieio.dvi: ${srcdir}/eieio.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi
  eieio.pdf: ${srcdir}/eieio.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi
  
- emacs-gnutls : $(infodir)/emacs-gnutls$(INFO_EXT)
- $(infodir)/emacs-gnutls$(INFO_EXT): ${srcdir}/emacs-gnutls.texi
 -emacs-gnutls : $(buildinfodir)/emacs-gnutls
 -$(buildinfodir)/emacs-gnutls: emacs-gnutls.texi
++emacs-gnutls : $(buildinfodir)/emacs-gnutls$(INFO_EXT)
++$(buildinfodir)/emacs-gnutls$(INFO_EXT): ${srcdir}/emacs-gnutls.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-gnutls.texi
  emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi
  emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi
  
- emacs-mime : $(infodir)/emacs-mime$(INFO_EXT)
- $(infodir)/emacs-mime$(INFO_EXT): ${srcdir}/emacs-mime.texi
 -emacs-mime : $(buildinfodir)/emacs-mime
 -$(buildinfodir)/emacs-mime: emacs-mime.texi
++emacs-mime : $(buildinfodir)/emacs-mime$(INFO_EXT)
++$(buildinfodir)/emacs-mime$(INFO_EXT): ${srcdir}/emacs-mime.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ ${srcdir}/emacs-mime.texi
  emacs-mime.dvi: ${srcdir}/emacs-mime.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
  emacs-mime.pdf: ${srcdir}/emacs-mime.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi
  
- epa : $(infodir)/epa$(INFO_EXT)
- $(infodir)/epa$(INFO_EXT): ${srcdir}/epa.texi
 -epa : $(buildinfodir)/epa
 -$(buildinfodir)/epa: epa.texi
++epa : $(buildinfodir)/epa$(INFO_EXT)
++$(buildinfodir)/epa$(INFO_EXT): ${srcdir}/epa.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/epa.texi
  epa.dvi: ${srcdir}/epa.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
  epa.pdf: ${srcdir}/epa.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
  
- erc : $(infodir)/erc$(INFO_EXT)
- $(infodir)/erc$(INFO_EXT): ${srcdir}/erc.texi
 -erc : $(buildinfodir)/erc
 -$(buildinfodir)/erc: erc.texi
++erc : $(buildinfodir)/erc$(INFO_EXT)
++$(buildinfodir)/erc$(INFO_EXT): ${srcdir}/erc.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/erc.texi
  erc.dvi: ${srcdir}/erc.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
  erc.pdf: ${srcdir}/erc.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi
  
- ert : $(infodir)/ert$(INFO_EXT)
- $(infodir)/ert$(INFO_EXT): ${srcdir}/ert.texi
 -ert : $(buildinfodir)/ert
 -$(buildinfodir)/ert: ert.texi
++ert : $(buildinfodir)/ert$(INFO_EXT)
++$(buildinfodir)/ert$(INFO_EXT): ${srcdir}/ert.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ert.texi
  ert.dvi: ${srcdir}/ert.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
  ert.pdf: ${srcdir}/ert.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
  
- eshell : $(infodir)/eshell$(INFO_EXT)
- $(infodir)/eshell$(INFO_EXT): ${srcdir}/eshell.texi
 -eshell : $(buildinfodir)/eshell
 -$(buildinfodir)/eshell: eshell.texi
++eshell : $(buildinfodir)/eshell$(INFO_EXT)
++$(buildinfodir)/eshell$(INFO_EXT): ${srcdir}/eshell.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eshell.texi
  eshell.dvi: ${srcdir}/eshell.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
  eshell.pdf: ${srcdir}/eshell.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi
  
- eudc : $(infodir)/eudc$(INFO_EXT)
- $(infodir)/eudc$(INFO_EXT): ${srcdir}/eudc.texi
 -eudc : $(buildinfodir)/eudc
 -$(buildinfodir)/eudc: eudc.texi
++eudc : $(buildinfodir)/eudc$(INFO_EXT)
++$(buildinfodir)/eudc$(INFO_EXT): ${srcdir}/eudc.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/eudc.texi
  eudc.dvi: ${srcdir}/eudc.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
  eudc.pdf: ${srcdir}/eudc.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi
  
- efaq : $(infodir)/efaq$(INFO_EXT)
- $(infodir)/efaq$(INFO_EXT): ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
 -efaq : $(buildinfodir)/efaq
 -$(buildinfodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
++efaq : $(buildinfodir)/efaq$(INFO_EXT)
++$(buildinfodir)/efaq$(INFO_EXT): ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) faq.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/faq.texi
  faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
  faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
@@@ -389,30 -428,30 +389,30 @@@ emacs-faq.html: ${srcdir}/faq.texi $(em
  emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
        $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi
  
- flymake : $(infodir)/flymake$(INFO_EXT)
- $(infodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi
 -flymake : $(buildinfodir)/flymake
 -$(buildinfodir)/flymake: flymake.texi
++flymake : $(buildinfodir)/flymake$(INFO_EXT)
++$(buildinfodir)/flymake$(INFO_EXT): ${srcdir}/flymake.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/flymake.texi
  flymake.dvi: ${srcdir}/flymake.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
  flymake.pdf: ${srcdir}/flymake.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi
  
- forms : $(infodir)/forms$(INFO_EXT)
- $(infodir)/forms$(INFO_EXT): ${srcdir}/forms.texi
 -forms : $(buildinfodir)/forms
 -$(buildinfodir)/forms: forms.texi
++forms : $(buildinfodir)/forms$(INFO_EXT)
++$(buildinfodir)/forms$(INFO_EXT): ${srcdir}/forms.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/forms.texi
  forms.dvi: ${srcdir}/forms.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
  forms.pdf: ${srcdir}/forms.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi
  
  # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
- gnus : $(infodir)/gnus$(INFO_EXT)
- $(infodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi
 -gnus : $(buildinfodir)/gnus
 -$(buildinfodir)/gnus: gnus.texi gnus-faq.texi
++gnus : $(buildinfodir)/gnus$(INFO_EXT)
++$(buildinfodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
 -gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi
 +gnus.dvi: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi
        sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
        $(ENVADD) $(TEXI2DVI) gnustmp.texi
        cp gnustmp.dvi $@
@@@ -423,238 -462,240 +423,238 @@@ gnus.pdf: ${srcdir}/gnus.texi ${srcdir}
        cp gnustmp.pdf $@
        rm gnustmp.*
  
 -# This is produced with --no-split to avoid making files whose
 -# names clash on DOS 8+3 filesystems
 -idlwave : $(buildinfodir)/idlwave
 -$(buildinfodir)/idlwave: idlwave.texi
 +# NB this one needs --no-split even without a .info extension.
- idlwave : $(infodir)/idlwave$(INFO_EXT)
- $(infodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi
++idlwave : $(buildinfodir)/idlwave$(INFO_EXT)
++$(buildinfodir)/idlwave$(INFO_EXT): ${srcdir}/idlwave.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/idlwave.texi
  idlwave.dvi: ${srcdir}/idlwave.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
  idlwave.pdf: ${srcdir}/idlwave.texi
        $(ENVADD) $(TEXI2PDF) ${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 : $(buildinfodir)/info   # circular!
 -$(buildinfodir)/info: info.texi
 +# NB this one needs --no-split even without a .info extension.
 +# Avoid name clash with overall "info" target.
- info.info : $(infodir)/info$(INFO_EXT)
- $(infodir)/info$(INFO_EXT): ${srcdir}/info.texi
++info.info : $(buildinfodir)/info$(INFO_EXT)
++$(buildinfodir)/info$(INFO_EXT): ${srcdir}/info.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/info.texi
  info.dvi: ${srcdir}/info.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
  info.pdf: ${srcdir}/info.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi
  
- mairix-el : $(infodir)/mairix-el$(INFO_EXT)
- $(infodir)/mairix-el$(INFO_EXT): ${srcdir}/mairix-el.texi
 -mairix-el : $(buildinfodir)/mairix-el
 -$(buildinfodir)/mairix-el: mairix-el.texi
++mairix-el : $(buildinfodir)/mairix-el$(INFO_EXT)
++$(buildinfodir)/mairix-el$(INFO_EXT): ${srcdir}/mairix-el.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mairix-el.texi
  mairix-el.dvi: ${srcdir}/mairix-el.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi
  mairix-el.pdf: ${srcdir}/mairix-el.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi
  
- message : $(infodir)/message$(INFO_EXT)
- $(infodir)/message$(INFO_EXT): ${srcdir}/message.texi
 -message : $(buildinfodir)/message
 -$(buildinfodir)/message: message.texi
++message : $(buildinfodir)/message$(INFO_EXT)
++$(buildinfodir)/message$(INFO_EXT): ${srcdir}/message.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) message.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/message.texi
  message.dvi: ${srcdir}/message.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
  message.pdf: ${srcdir}/message.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi
  
- mh-e : $(infodir)/mh-e$(INFO_EXT)
- $(infodir)/mh-e$(INFO_EXT): ${srcdir}/mh-e.texi
 -mh-e : $(buildinfodir)/mh-e
 -$(buildinfodir)/mh-e: mh-e.texi
++mh-e : $(buildinfodir)/mh-e$(INFO_EXT)
++$(buildinfodir)/mh-e$(INFO_EXT): ${srcdir}/mh-e.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/mh-e.texi
  mh-e.dvi: ${srcdir}/mh-e.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
  mh-e.pdf: ${srcdir}/mh-e.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi
  
- newsticker : $(infodir)/newsticker$(INFO_EXT)
- $(infodir)/newsticker$(INFO_EXT): ${srcdir}/newsticker.texi
 -newsticker : $(buildinfodir)/newsticker
 -$(buildinfodir)/newsticker: newsticker.texi
++newsticker : $(buildinfodir)/newsticker$(INFO_EXT)
++$(buildinfodir)/newsticker$(INFO_EXT): ${srcdir}/newsticker.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/newsticker.texi
  newsticker.dvi: ${srcdir}/newsticker.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
  newsticker.pdf: ${srcdir}/newsticker.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi
  
- nxml-mode : $(infodir)/nxml-mode$(INFO_EXT)
- $(infodir)/nxml-mode$(INFO_EXT): ${srcdir}/nxml-mode.texi
 -nxml-mode : $(buildinfodir)/nxml-mode
 -$(buildinfodir)/nxml-mode: nxml-mode.texi
++nxml-mode : $(buildinfodir)/nxml-mode$(INFO_EXT)
++$(buildinfodir)/nxml-mode$(INFO_EXT): ${srcdir}/nxml-mode.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/nxml-mode.texi
  nxml-mode.dvi: ${srcdir}/nxml-mode.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi
  nxml-mode.pdf: ${srcdir}/nxml-mode.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi
  
- org : $(infodir)/org$(INFO_EXT)
- $(infodir)/org$(INFO_EXT): ${srcdir}/org.texi
 -org : $(buildinfodir)/org
 -$(buildinfodir)/org: org.texi
++org : $(buildinfodir)/org$(INFO_EXT)
++$(buildinfodir)/org$(INFO_EXT): ${srcdir}/org.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) org.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/org.texi
  org.dvi: ${srcdir}/org.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
  org.pdf: ${srcdir}/org.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi
  
- pcl-cvs : $(infodir)/pcl-cvs$(INFO_EXT)
- $(infodir)/pcl-cvs$(INFO_EXT): ${srcdir}/pcl-cvs.texi
 -pcl-cvs : $(buildinfodir)/pcl-cvs
 -$(buildinfodir)/pcl-cvs: pcl-cvs.texi
++pcl-cvs : $(buildinfodir)/pcl-cvs$(INFO_EXT)
++$(buildinfodir)/pcl-cvs$(INFO_EXT): ${srcdir}/pcl-cvs.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pcl-cvs.texi
  pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
  pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi
  
- pgg : $(infodir)/pgg$(INFO_EXT)
- $(infodir)/pgg$(INFO_EXT): ${srcdir}/pgg.texi
 -pgg : $(buildinfodir)/pgg
 -$(buildinfodir)/pgg: pgg.texi
++pgg : $(buildinfodir)/pgg$(INFO_EXT)
++$(buildinfodir)/pgg$(INFO_EXT): ${srcdir}/pgg.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/pgg.texi
  pgg.dvi: ${srcdir}/pgg.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
  pgg.pdf: ${srcdir}/pgg.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi
  
- rcirc : $(infodir)/rcirc$(INFO_EXT)
- $(infodir)/rcirc$(INFO_EXT): ${srcdir}/rcirc.texi
 -rcirc : $(buildinfodir)/rcirc
 -$(buildinfodir)/rcirc: rcirc.texi
++rcirc : $(buildinfodir)/rcirc$(INFO_EXT)
++$(buildinfodir)/rcirc$(INFO_EXT): ${srcdir}/rcirc.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/rcirc.texi
  rcirc.dvi: ${srcdir}/rcirc.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
  rcirc.pdf: ${srcdir}/rcirc.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi
  
- reftex : $(infodir)/reftex$(INFO_EXT)
- $(infodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi
 -reftex : $(buildinfodir)/reftex
 -$(buildinfodir)/reftex: reftex.texi
++reftex : $(buildinfodir)/reftex$(INFO_EXT)
++$(buildinfodir)/reftex$(INFO_EXT): ${srcdir}/reftex.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/reftex.texi
  reftex.dvi: ${srcdir}/reftex.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
  reftex.pdf: ${srcdir}/reftex.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi
  
- remember : $(infodir)/remember$(INFO_EXT)
- $(infodir)/remember$(INFO_EXT): ${srcdir}/remember.texi
 -remember : $(buildinfodir)/remember
 -$(buildinfodir)/remember: remember.texi
++remember : $(buildinfodir)/remember$(INFO_EXT)
++$(buildinfodir)/remember$(INFO_EXT): ${srcdir}/remember.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/remember.texi
  remember.dvi: ${srcdir}/remember.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi
  remember.pdf: ${srcdir}/remember.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi
  
- sasl : $(infodir)/sasl$(INFO_EXT)
- $(infodir)/sasl$(INFO_EXT): ${srcdir}/sasl.texi
 -sasl : $(buildinfodir)/sasl
 -$(buildinfodir)/sasl: sasl.texi
++sasl : $(buildinfodir)/sasl$(INFO_EXT)
++$(buildinfodir)/sasl$(INFO_EXT): ${srcdir}/sasl.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sasl.texi
  sasl.dvi: ${srcdir}/sasl.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi
  sasl.pdf: ${srcdir}/sasl.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi
  
- sc : $(infodir)/sc$(INFO_EXT)
- $(infodir)/sc$(INFO_EXT): ${srcdir}/sc.texi
 -sc : $(buildinfodir)/sc
 -$(buildinfodir)/sc: sc.texi
++sc : $(buildinfodir)/sc$(INFO_EXT)
++$(buildinfodir)/sc$(INFO_EXT): ${srcdir}/sc.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sc.texi
  sc.dvi: ${srcdir}/sc.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
  sc.pdf: ${srcdir}/sc.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi
  
- semantic : $(infodir)/semantic$(INFO_EXT)
- $(infodir)/semantic$(INFO_EXT): ${srcdir}/semantic.texi ${srcdir}/sem-user.texi
 -semantic : $(buildinfodir)/semantic
 -$(buildinfodir)/semantic: semantic.texi sem-user.texi
++semantic : $(buildinfodir)/semantic$(INFO_EXT)
++$(buildinfodir)/semantic$(INFO_EXT): ${srcdir}/semantic.texi ${srcdir}/sem-user.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
 -semantic.dvi: ${srcdir}/semantic.texi sem-user.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/semantic.texi
 +semantic.dvi: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi
 -semantic.pdf: ${srcdir}/semantic.texi sem-user.texi
 +semantic.pdf: ${srcdir}/semantic.texi ${srcdir}/sem-user.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi
  
- ses : $(infodir)/ses$(INFO_EXT)
- $(infodir)/ses$(INFO_EXT): ${srcdir}/ses.texi
 -ses : $(buildinfodir)/ses
 -$(buildinfodir)/ses: ses.texi
++ses : $(buildinfodir)/ses$(INFO_EXT)
++$(buildinfodir)/ses$(INFO_EXT): ${srcdir}/ses.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ses.texi
  ses.dvi: ${srcdir}/ses.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
  ses.pdf: ${srcdir}/ses.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi
  
- sieve : $(infodir)/sieve$(INFO_EXT)
- $(infodir)/sieve$(INFO_EXT): ${srcdir}/sieve.texi
 -sieve : $(buildinfodir)/sieve
 -$(buildinfodir)/sieve: sieve.texi
++sieve : $(buildinfodir)/sieve$(INFO_EXT)
++$(buildinfodir)/sieve$(INFO_EXT): ${srcdir}/sieve.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/sieve.texi
  sieve.dvi: ${srcdir}/sieve.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
  sieve.pdf: ${srcdir}/sieve.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi
  
- smtpmail : $(infodir)/smtpmail$(INFO_EXT)
- $(infodir)/smtpmail$(INFO_EXT): ${srcdir}/smtpmail.texi
 -smtpmail : $(buildinfodir)/smtpmail
 -$(buildinfodir)/smtpmail: smtpmail.texi
++smtpmail : $(buildinfodir)/smtpmail$(INFO_EXT)
++$(buildinfodir)/smtpmail$(INFO_EXT): ${srcdir}/smtpmail.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/smtpmail.texi
  smtpmail.dvi: ${srcdir}/smtpmail.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
  smtpmail.pdf: ${srcdir}/smtpmail.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi
  
- speedbar : $(infodir)/speedbar$(INFO_EXT)
- $(infodir)/speedbar$(INFO_EXT): ${srcdir}/speedbar.texi
 -speedbar : $(buildinfodir)/speedbar
 -$(buildinfodir)/speedbar: speedbar.texi
++speedbar : $(buildinfodir)/speedbar$(INFO_EXT)
++$(buildinfodir)/speedbar$(INFO_EXT): ${srcdir}/speedbar.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/speedbar.texi
  speedbar.dvi: ${srcdir}/speedbar.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
  speedbar.pdf: ${srcdir}/speedbar.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi
  
- tramp : $(infodir)/tramp$(INFO_EXT)
- $(infodir)/tramp$(INFO_EXT): ${srcdir}/tramp.texi ${srcdir}/trampver.texi
 -tramp : $(buildinfodir)/tramp
 -$(buildinfodir)/tramp: tramp.texi trampver.texi
++tramp : $(buildinfodir)/tramp$(INFO_EXT)
++$(buildinfodir)/tramp$(INFO_EXT): ${srcdir}/tramp.texi ${srcdir}/trampver.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs tramp.texi
 -tramp.dvi: ${srcdir}/tramp.texi trampver.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs ${srcdir}/tramp.texi
 +tramp.dvi: ${srcdir}/tramp.texi ${srcdir}/trampver.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
 -tramp.pdf: ${srcdir}/tramp.texi trampver.texi
 +tramp.pdf: ${srcdir}/tramp.texi ${srcdir}/trampver.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi
  
- url : $(infodir)/url$(INFO_EXT)
- $(infodir)/url$(INFO_EXT): ${srcdir}/url.texi
 -url : $(buildinfodir)/url
 -$(buildinfodir)/url: url.texi
++url : $(buildinfodir)/url$(INFO_EXT)
++$(buildinfodir)/url$(INFO_EXT): ${srcdir}/url.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) url.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/url.texi
  url.dvi: ${srcdir}/url.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
  url.pdf: ${srcdir}/url.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi
  
- vip : $(infodir)/vip$(INFO_EXT)
- $(infodir)/vip$(INFO_EXT): ${srcdir}/vip.texi
 -vip : $(buildinfodir)/vip
 -$(buildinfodir)/vip: vip.texi
++vip : $(buildinfodir)/vip$(INFO_EXT)
++$(buildinfodir)/vip$(INFO_EXT): ${srcdir}/vip.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/vip.texi
  vip.dvi: ${srcdir}/vip.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
  vip.pdf: ${srcdir}/vip.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi
  
- viper : $(infodir)/viper$(INFO_EXT)
- $(infodir)/viper$(INFO_EXT): ${srcdir}/viper.texi
 -viper : $(buildinfodir)/viper
 -$(buildinfodir)/viper: viper.texi
++viper : $(buildinfodir)/viper$(INFO_EXT)
++$(buildinfodir)/viper$(INFO_EXT): ${srcdir}/viper.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/viper.texi
  viper.dvi: ${srcdir}/viper.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
  viper.pdf: ${srcdir}/viper.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi
  
- widget : $(infodir)/widget$(INFO_EXT)
- $(infodir)/widget$(INFO_EXT): ${srcdir}/widget.texi
 -widget : $(buildinfodir)/widget
 -$(buildinfodir)/widget: widget.texi
++widget : $(buildinfodir)/widget$(INFO_EXT)
++$(buildinfodir)/widget$(INFO_EXT): ${srcdir}/widget.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/widget.texi
  widget.dvi: ${srcdir}/widget.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
  widget.pdf: ${srcdir}/widget.texi
        $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi
  
- woman : $(infodir)/woman$(INFO_EXT)
- $(infodir)/woman$(INFO_EXT): ${srcdir}/woman.texi
 -woman : $(buildinfodir)/woman
 -$(buildinfodir)/woman: woman.texi
++woman : $(buildinfodir)/woman$(INFO_EXT)
++$(buildinfodir)/woman$(INFO_EXT): ${srcdir}/woman.texi
        $(mkinfodir)
 -      cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
 +      $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/woman.texi
  woman.dvi: ${srcdir}/woman.texi
        $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
  woman.pdf: ${srcdir}/woman.texi
@@@ -675,10 -715,9 +675,10 @@@ clean: mostlyclea
  distclean: clean
  #     rm -f Makefile
  
- ## infodir is relative to srcdir.
+ ## buildinfodir is relative to srcdir.
  maintainer-clean: distclean
-       cd $(infodir); for file in $(INFO_TARGETS); do \
 -      cd $(srcdir); for file in $(INFO_TARGETS); do \
++      cd $(buildinfodir); for file in $(INFO_TARGETS); do \
 +        file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \
          rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \
        done