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

[gnu-emacs] / doc / lispref / Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index dd820d85133d9aeb98464afc1a62bd30b68682a8..32a241e2a2dc09c74f00290b166130896d0feef5 100644 (file)
--- 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}