X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/06d8ace51597cd41e110560a56a1abeb6cce23d6..ba3189039adc8ec5eba5ed3e21d42019a4616b7c:/doc/lispref/makefile.w32-in

diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 3daf4a6032..a56edd9f49 100644
--- 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, 2011
-#   Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -23,25 +22,27 @@
 srcdir = .
 
 infodir = $(srcdir)/../../info
-usermanualdir = $(srcdir)/../emacs
 
 # Directory with emacsver.texi.
 emacsdir = $(srcdir)/../emacs
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
+
+INFO_EXT=.info
+INFO_OPTS=--no-split
 
 # 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:
 
@@ -50,7 +51,6 @@ srcs = \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
-  $(srcdir)/back.texi \
   $(srcdir)/backups.texi \
   $(srcdir)/buffers.texi \
   $(srcdir)/commands.texi \
@@ -74,7 +74,6 @@ srcs = \
   $(srcdir)/keymaps.texi \
   $(srcdir)/lists.texi \
   $(srcdir)/loading.texi \
-  $(srcdir)/locals.texi \
   $(srcdir)/macros.texi \
   $(srcdir)/maps.texi \
   $(srcdir)/markers.texi \
@@ -84,6 +83,7 @@ srcs = \
   $(srcdir)/numbers.texi \
   $(srcdir)/objects.texi \
   $(srcdir)/os.texi \
+  $(srcdir)/package.texi \
   $(srcdir)/positions.texi \
   $(srcdir)/processes.texi \
   $(srcdir)/searching.texi \
@@ -105,18 +105,16 @@ srcs = \
 
 # The info file is named `elisp'.
 
-info: $(infodir)/elisp
+info: $(infodir)/elisp$(INFO_EXT)
 
 $(infodir)/dir:
 	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
-$(infodir)/elisp: $(srcs)
-	$(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
-	  -o $(infodir)/elisp $(srcdir)/elisp.texi
+$(infodir)/elisp$(INFO_EXT): $(srcs)
+	$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(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 \
@@ -128,4 +126,4 @@ distclean: clean
 	- $(DEL) makefile
 
 maintainer-clean: distclean
-	- $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux
+	- $(DEL) elisp$(INFO_EXT) elisp$(INFO_EXT)-? elisp$(INFO_EXT)-?? elisp.dvi elisp.oaux