Merge from trunk.

[bpt/emacs.git] / doc / lispref / makefile.w32-in

diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 7b88e86..0a4aea2 100644 (file)
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003-2011  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -38,14 +38,9 @@ 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);$(texinputdir);$(TEXINPUTS)" \
+               "TEXINPUTS=$(srcdir);$(texinfodir);$(emacsdir);$(TEXINPUTS)" \
                "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /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)
-
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -77,7 +72,6 @@ srcs = \
   $(srcdir)/keymaps.texi \
   $(srcdir)/lists.texi \
   $(srcdir)/loading.texi \
-  $(srcdir)/locals.texi \
   $(srcdir)/macros.texi \
   $(srcdir)/maps.texi \
   $(srcdir)/markers.texi \