--- a/man/lispref/Makefile	Mon Aug 13 08:47:16 2007 +0200
+++ b/man/lispref/Makefile	Mon Aug 13 08:47:35 2007 +0200
@@ -1,35 +1,28 @@
 # Makefile for the  XEmacs Lisp Programmer's Manual.
-#
-# based on FSF Makefile, 11 August 1990
-# Modified by Ben Wing, February 1994
-# merged with Makefile for ELisp Manual 2.4
+
+# This file is part of XEmacs.
 
-# Redefine `TEX' if `tex' does not invoke plain TeX. For example:
-# TEX=platex
-
-TEX=tex
-
-# Where the TeX macros are kept:
-texmacrodir = /usr/local/lib/tex/macros
+# XEmacs is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2, or (at your option) any
+# later version.
 
-# Where the Emacs hierarchy lives ($EMACS in the INSTALL document for Emacs.)
-# For example: 
-# emacslibdir = /usr/local/gnu/lib/emacs
-
-# Directory where Emacs is installed, by default:
-emacslibdir = /usr/local/emacs
+# XEmacs is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
 
-# Unless you have a nonstandard Emacs installation, these shouldn't have to 
-# be changed.
-prefix = /usr/local
-infodir = ${prefix}/info
-
-# The name of the manual:
+# You should have received a copy of the GNU General Public License
+# along with XEmacs; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
 VERSION=2.4
 NAME=lispref
 manual = elisp-manual-19-$(VERSION)
 
+TEXI2DVI = texi2dvi
+
 # Uncomment this line for permuted index.
 # permuted_index = 1 
 
@@ -49,75 +42,37 @@
   text.texi tips.texi toolbar.texi tooltalk.texi variables.texi windows.texi \
   x-windows.texi index.unperm index.perm
 
-all: ../../info/$(NAME).info
+all : info
+info : ../../info/$(NAME).info
 
-$(NAME).dvi: $(srcs) index.texi ../texindex
+../../info/$(NAME).info: $(srcs) index.texi
+	makeinfo -o $@ $(NAME).texi
+
+dvi: $(NAME).dvi
+
+$(NAME).dvi: $(srcs) index.texi
 	# Avoid losing old contents of aux file entirely.
 	-mv $(NAME).aux $(NAME).oaux
 	# First shot to define xrefs:
 	$(TEX) $(NAME).texi
 	if [ a${permuted_index} != a ]; \
-	then \
-	  ./permute-index; \
-	  mv permuted.fns $(NAME).fns; \
-	else \
-	  ../texindex $(NAME).??; \
+	then ./permute-index && mv permuted.fns $(NAME).fns; \
+	else texindex $(NAME).??; \
 	fi
 	$(TEX) $(NAME).texi
 
 index.texi:
 	if [ a${permuted_index} != a ]; \
-	then \
-	  ln -s index.perm index.texi; \
-	else \
-	  ln -s index.unperm index.texi; \
+	then ln -s index.perm   index.texi; \
+	else ln -s index.unperm index.texi; \
 	fi
 
-../../info/$(NAME).info: $(srcs) index.texi ../makeinfo
-	../makeinfo $(NAME).texi
-
 mostlyclean:
 	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
               *.vr *.vrs *.pg *.pgs *.ky *.kys
-
 clean: mostlyclean
-	rm -f *.dvi *.ps
-	rm -f make.out core 
-	rm -f index.texi
-
-# not working.
-#install: elisp elisp.dvi
-#	mv elisp elisp-* $(infodir)
-#	@echo also add the line for elisp to $(infodir)/dir.
-
-# not working.
-#installall: install
-#	install -c texinfo.tex $(texmacrodir)
-
+	rm -f *.dvi *.ps make.out core index.texi
 distclean: clean
 realclean: distclean
 extraclean: distclean
 	-rm -f *~ \#*
-
-../texindex:
-	(cd ..; make texindex)
-
-# not working.
-#maintainer-clean: clean
-#	rm -f elisp elisp-*
-
-# not working.
-# dist:
-#	-mkdir temp
-#	-mkdir temp/$(manual)
-#	-ln README Makefile permute-index $(srcs) \
-#   texinfo.tex getopt.c getopt1.c getopt.h \
-#   elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] temp/$(manual)
-#	-rm -f temp/$(manual)/texindex.c temp/$(manual)/makeinfo.c
-#	cp texindex.c makeinfo.c temp/$(manual)
-#	(cd temp/$(manual); rm -f *~)
-#	(cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
-#	-rm -rf temp
-
-../makeinfo:
-	(cd ..; make makeinfo)