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

2 files changed, 11 insertions, 6 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 89efb5c6255..91c3617cff8 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+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):
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index dd820d85133..32a241e2a2d 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.
@@ -101,18 +101,18 @@ srcs = \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
-mkinfodir = @${MKDIR_P} ${infodir}
+mkinfodir = @${MKDIR_P} ${buildinfodir}
 
 .PHONY: info dvi pdf ps
 
-info: $(infodir)/elisp$(INFO_EXT)
+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$(INFO_EXT): $(srcs)
         $(mkinfodir)
         $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi
 
@@ -145,7 +145,7 @@ clean: mostlyclean
 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$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9]
 
 maintainer-clean: distclean infoclean
 
@@ -160,7 +160,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}