* doc/lispref/minibuf.texi (High-Level Completion): Updates for read-color.

[gnu-emacs] / doc / lispref / makefile.w32-in

diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 86a0de330950e374232544a463d4b715b1d0d834..11b6beab84d7e54a6f3461f61b834854a8978423 100644 (file)
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -1,7 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+# Copyright (C) 2003-2012  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -23,25 +22,24 @@
 srcdir = .
 
 infodir = $(srcdir)/../../info
-usermanualdir = $(srcdir)/../emacs
 
 # Directory with emacsver.texi.
 emacsdir = $(srcdir)/../emacs
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
 TEX=tex
 INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force --enable-encoding  -I$(srcdir) -I$(emacsdir)
 
 # The environment variable and its value to add $(srcdir) to the path
 # searched for TeX input files.
-texinputdir = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
-
-# The name of the manual:
-VERSION=2.9
-## FIXME can this be set by configure, as per Makefile.in?
-manual = elisp-manual-23-$(VERSION)
+texinputdir = $(srcdir)\..\..\nt\envadd.bat \
+               "TEXINPUTS=$(srcdir);$(texinfodir);$(emacsdir);$(TEXINPUTS)" \
+               "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 # List of all the texinfo files in the manual:
 
@@ -84,6 +82,7 @@ srcs = \
   $(srcdir)/numbers.texi \
   $(srcdir)/objects.texi \
   $(srcdir)/os.texi \
+  $(srcdir)/package.texi \
   $(srcdir)/positions.texi \
   $(srcdir)/processes.texi \
   $(srcdir)/searching.texi \
@@ -111,12 +110,10 @@ $(infodir)/dir:
        $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)
-       $(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
-         -o $(infodir)/elisp $(srcdir)/elisp.texi
+       $(MAKEINFO) $(MAKEINFO_OPTS) -o $(infodir)/elisp $(srcdir)/elisp.texi
 
 elisp.dvi: $(srcs)
-       $(texinputdir) $(TEX) -I $(usermanualdir) -I$(emacsdir) \
-         $(srcdir)/elisp.texi
+       $(texinputdir) $(TEX) $(srcdir)/elisp.texi
 
 clean:
        - $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \