--- a/man/new-users-guide/Makefile	Mon Aug 13 08:47:16 2007 +0200
+++ b/man/new-users-guide/Makefile	Mon Aug 13 08:47:35 2007 +0200
@@ -1,65 +1,49 @@
 # Makefile for the XEmacs New Users Guide
-#
-# based on XEmacs Makefile
+
+# 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.
 
 NAME=new-users-guide
 
+SHELL = /bin/sh
+TEXI2DVI = texi2dvi
+
 # List of all the texinfo files in the manual:
 
 srcs = new-users-guide.texi custom1.texi files.texi region.texi \
   custom2.texi help.texi search.texi edit.texi modes.texi \
   xmenu.texi enter.texi
 
-all: ../../info/$(NAME).info
+all : info
+info : ../../info/$(NAME).info
 
-$(NAME).dvi: $(srcs) ../texindex
-	# Avoid losing old contents of aux file entirely.
-	-mv $(NAME).aux $(NAME).oaux
-	# First shot to define xrefs:
-	$(TEX) $(NAME).texi
-	../texindex $(NAME).??
-	$(TEX) $(NAME).texi
+../../info/$(NAME).info: $(srcs)
+	makeinfo -o $@ $(NAME).texi
 
-../../info/$(NAME).info: $(srcs) ../makeinfo
-	../makeinfo $(NAME).texi
+dvi : $(NAME).dvi
+.texi.dvi :
+	$(TEXI2DVI) $<
 
 mostlyclean:
 	rm -f *.toc *.aux *.oaux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
               *.vr *.vrs *.pg *.pgs *.ky *.kys
-
 clean: mostlyclean
-	rm -f *.dvi *.ps
-	rm -f make.out core
-
-distclean: clean
-realclean: distclean
-extraclean: distclean
+	rm -f *.dvi *.ps make.out core
+distclean:  clean
+realclean:  clean
+extraclean: clean
 	-rm -f *~ \#*
-
-../texindex:
-	(cd ..; make texindex)
-
-../makeinfo:
-	(cd ..; make makeinfo)