Merge changes from emacs-23 branch

[bpt/emacs.git] / doc / lispref / Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index be8b6ca..75fa884 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -1,8 +1,6 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 1990-1996, 1998-2011  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -32,11 +30,15 @@ texinfodir = $(srcdir)/../misc
 # Directory with emacsver.texi.
 emacsdir =  $(srcdir)/../emacs
 
-MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
+MAKEINFO = @MAKEINFO@
+MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir)
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 DVIPS = dvips
 
+ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
+         MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
+
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -78,6 +80,7 @@ srcs = \
   $(srcdir)/numbers.texi \
   $(srcdir)/objects.texi \
   $(srcdir)/os.texi \
+  $(srcdir)/package.texi \
   $(srcdir)/positions.texi \
   $(srcdir)/processes.texi \
   $(srcdir)/searching.texi \
@@ -106,19 +109,19 @@ ps: elisp.ps
 
 $(infodir)/elisp: $(srcs)
        $(mkinfodir)
-       $(MAKEINFO) -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
+       $(ENVADD) $(TEXI2DVI) $<
 
 elisp.html: $(srcs)
-       $(MAKEINFO) --html -o $@ $<
+       $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
 
 elisp.ps: elisp.dvi
        $(DVIPS) -o $@ $<
 
 elisp.pdf: $(srcs)
-       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
+       $(ENVADD) $(TEXI2PDF) $<
 
 .PHONY: mostlyclean clean distclean maintainer-clean infoclean