X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8bf425323b25d464ae9d712a16d96a68fa9fcf6b..0925c80cd3d8f9a973d699fc1dbdbe79cca62988:/lispref/makefile.w32-in

diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 8f4baa423c..038c05db7c 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -1,7 +1,6 @@
-# Makefile for the GNU Emacs Lisp Reference Manual.
+# -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003
-#  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -17,8 +16,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Standard configure variables.
 srcdir = .
@@ -29,7 +28,7 @@ infodir = $(srcdir)/../info
 # TEX=platex
 TEX=tex
 INSTALL_INFO = install-info
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --force
 
 # The environment variable and its value to add $(srcdir) to the path
 # searched for TeX input files.
@@ -39,9 +38,6 @@ texinputdir = $(srcdir)\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
 VERSION=2.9
 manual = elisp-manual-21-$(VERSION)
 
-# Uncomment this line for permuted index.
-# permuted_index = 1 
-
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -51,7 +47,6 @@ srcs = \
   $(srcdir)/back.texi \
   $(srcdir)/backups.texi \
   $(srcdir)/buffers.texi \
-  $(srcdir)/calendar.texi \
   $(srcdir)/commands.texi \
   $(srcdir)/compile.texi \
   $(srcdir)/control.texi \
@@ -95,8 +90,7 @@ srcs = \
   $(srcdir)/tips.texi \
   $(srcdir)/variables.texi \
   $(srcdir)/windows.texi \
-  $(srcdir)/index.unperm \
-  $(srcdir)/index.perm \
+  $(srcdir)/index.texi \
   $(srcdir)/gpl.texi \
   $(srcdir)/doclicense.texi
 
@@ -104,35 +98,25 @@ srcs = \
 .PHONY: clean
 
 # The info file is named `elisp'.
+
 info: $(infodir)/elisp
+
+$(infodir)/dir:
 	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
-$(infodir)/elisp: $(srcs) index.texi
-	$(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi -o $(infodir)/elisp
+$(infodir)/elisp: $(srcs)
+	$(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi
 
-elisp.dvi: $(srcs) index.texi
-#	Avoid losing old contents of aux file entirely.
-	-ren elisp.aux elisp.oaux
-#	First shot to define xrefs.
+elisp.dvi: $(srcs)
 	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
-	if not a$(permuted_index) == a  sh $(srcdir)/permute-index
-	if not a$(permuted_index) == a  ren permuted.fns elisp.fns
-	if not a$(permuted_index) == a  texindex elisp.tp
-	if a$(permuted_index) == a  texindex elisp.??
-	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
-
-index.texi:
-	if a$(permuted_index) == a  cp $(srcdir)/index.unperm index.texi
-	if not a$(permuted_index) == a  cp $(srcdir)/index.perm index.texi
 
 clean:
-	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys
-	rm -f make.out core 
-	rm -f index.texi
-	rm -f $(infodir)/elisp*
+	- $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
+                 *.vr *.vrs *.pg *.pgs *.ky *.kys
+	- $(DEL) make.out core
+	- $(DEL) $(infodir)/elisp*
 
 distclean: clean
 
 maintainer-clean: clean
-	rm -f elisp elisp-* elisp.dvi elisp.oaux
+	- $(DEL) elisp elisp-* elisp.dvi elisp.oaux