Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

[bpt/emacs.git] / doc / lispref / two-volume.make

diff --git a/doc/lispref/two-volume.make b/doc/lispref/two-volume.make
index 4fcfe90..07fcaf0 100644 (file)
--- a/doc/lispref/two-volume.make
+++ b/doc/lispref/two-volume.make
@@ -1,11 +1,14 @@
-# Copyright 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
 # See end for copying conditions.
 
 # although it would be nice to use tex rather than pdftex to avoid
 # colors, spurious warnings about names being referenced but not
 # existing, etc., dvips | ps2pdf doesn't preserve the page size.
 # Instead of creating a special dvips config file, put up with the warnings.
-tex = pdftex -interaction=nonstopmode
+texinfodir=../misc
+emacsdir=../emacs
+
+tex = TEXINPUTS=".:$(texinfodir):${emacsdir}:${TEXINPUTS}" pdftex -interaction=nonstopmode
 
 all: vol1.pdf vol2.pdf
 
@@ -61,8 +64,6 @@ elisp1med-aux-vol-added: elisp1med-init
 #
 elisp2med-aux-vol-added: elisp2med-init
        sed 's/-pg}{\(.*\)}$$/-pg}{\1, vol.@tie2}/' elisp2med-aux >$@
-       
-
 
 # \f intermediate index (fns) file.
 # 
@@ -99,7 +100,7 @@ elisp2med-fn-vol-added: elisp2med-init
 # 
 # So, we start all over again, from these fns/aux/toc files.
 # 
-elisp1med-init: elisp1-fns-ready elisp1-aux-ready elisp1init-toc-ready texinfo.tex
+elisp1med-init: elisp1-fns-ready elisp1-aux-ready elisp1init-toc-ready $(texinfodir)/texinfo.tex
        @echo -e "\f Intermediate TeX run for volume 1..."
        cp elisp1init-toc-ready elisp1-toc-ready.toc
        cp elisp1-fns-ready vol1.fns
@@ -109,7 +110,7 @@ elisp1med-init: elisp1-fns-ready elisp1-aux-ready elisp1init-toc-ready texinfo.t
        mv vol1.aux elisp1med-aux
        mv vol1.toc elisp1med-toc
 #
-elisp2med-init: elisp2-fns-ready elisp2-aux-ready elisp2init-toc-ready texinfo.tex
+elisp2med-init: elisp2-fns-ready elisp2-aux-ready elisp2init-toc-ready $(texinfodir)/texinfo.tex
        @echo "Final TeX run for volume 2..."
        cp elisp2init-toc-ready elisp2-toc-ready.toc
        cp elisp2-fns-ready vol2.fns
@@ -156,7 +157,6 @@ elisp1-aux-vol-added: elisp1-init
 #
 elisp2-aux-vol-added: elisp2-init
        sed 's/-pg}{\(.*\)}$$/-pg}{\1, vol.@tie2}/' elisp2-aux >$@
-       
 
 # \f initial index (fns) file.
 # 
@@ -222,4 +222,3 @@ elisp2-init: vol2.texi
 # You should have received a copy of the GNU General Public License
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
  
-# arch-tag: 5c258a2e-d4a9-4d0e-b279-fb3a6faa27eb