Move the parts of the old man/Makefile.in that do not refer to the

Emacs manual here.
(infodir): New variable.
(INFO_TARGETS, info): Use infodir.  Also used by all info targets.
(cc-mode.texi, faq.texi): Update references to source file locations.

Add `basename' versions of all info targets, for convenience when
rebuilding just one manual.
(../etc/GNU): Delete obsolete target.
(.SUFFIXES): Use $(TEXI2DVI) rather than texi2dvi.
(mostlyclean): Add *.op, *.ops.  Move *.aux *.cps *.fns *.kys *.pgs

1 files changed, 263 insertions, 240 deletions

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 00088b74b51..65caeb77ecb 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,4 +1,4 @@
-#### Makefile for the Emacs Manual and other documentation.
+#### Makefile for documentation other than the Emacs manual.
 
 # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 #   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -20,7 +20,8 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# Where to find the source code.  $(srcdir) will be the man
+
+# Where to find the source code.  $(srcdir) will be the man-aux
 # subdirectory of the source tree.  This is
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
@@ -29,177 +30,210 @@ top_srcdir=@top_srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
+## Where the output files go.
+## Note that the setfilename command in the .texi files assumes this.
+infodir=../../info
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
 MAKEINFO = makeinfo --force
-INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
-                ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
-                ../info/message ../info/sieve ../info/pgg ../info/emacs-mime \
-                ../info/info ../info/mh-e ../info/reftex \
-                ../info/sc ../info/vip ../info/viper ../info/widget \
-                ../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
-                ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
-                ../info/woman ../info/eshell ../info/org ../info/url \
-                ../info/speedbar ../info/tramp ../info/ses ../info/smtpmail \
-                ../info/flymake ../info/newsticker ../info/rcirc ../info/erc
-DVI_TARGETS =   emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-                 ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \
-                 gnus.dvi message.dvi sieve.dvi pgg.dvi mh-e.dvi \
-                 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
-                 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-                 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
-                 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-                 newsticker.dvi emacs-xtra.dvi rcirc.dvi erc.dvi
-INFOSOURCES = info.texi
+
+INFO_TARGETS = \
+        $(infodir)/ada-mode \
+        $(infodir)/autotype \
+        $(infodir)/calc \
+        $(infodir)/ccmode \
+        $(infodir)/cl \
+        $(infodir)/dired-x \
+        $(infodir)/ebrowse \
+        $(infodir)/ediff \
+        $(infodir)/emacs-mime \
+        $(infodir)/erc \
+        $(infodir)/eshell \
+        $(infodir)/eudc \
+        $(infodir)/efaq \
+        $(infodir)/flymake \
+        $(infodir)/forms \
+        $(infodir)/gnus \
+        $(infodir)/idlwave \
+        $(infodir)/info \
+        $(infodir)/message \
+        $(infodir)/mh-e \
+        $(infodir)/newsticker \
+        $(infodir)/org \
+        $(infodir)/pcl-cvs \
+        $(infodir)/pgg \
+        $(infodir)/rcirc \
+        $(infodir)/reftex \
+        $(infodir)/sc \
+        $(infodir)/ses \
+        $(infodir)/sieve \
+        $(infodir)/smtpmail \
+        $(infodir)/speedbar \
+        $(infodir)/tramp \
+        $(infodir)/url \
+        $(infodir)/vip \
+        $(infodir)/viper \
+        $(infodir)/widget \
+        $(infodir)/woman
+
+DVI_TARGETS = \
+        ada-mode.dvi \
+        autotype.dvi \
+        calc.dvi \
+        cc-mode.dvi \
+        cl.dvi \
+        dired-x.dvi \
+        ebrowse.dvi \
+        ediff.dvi \
+        emacs-mime.dvi \
+        erc.dvi \
+        eshell.dvi \
+        eudc.dvi \
+        faq.dvi \
+        flymake.dvi \
+        forms.dvi \
+        gnus.dvi \
+        idlwave.dvi \
+        info.dvi \
+        message.dvi \
+        mh-e.dvi \
+        newsticker.dvi \
+        org.dvi \
+        pcl-cvs.dvi \
+        pgg.dvi \
+        rcirc.dvi \
+        reftex.dvi \
+        sc.dvi \
+        ses.dvi \
+        sieve.dvi \
+        smtpmail.dvi \
+        speedbar.dvi \
+        tramp.dvi \
+        url.dvi \
+        vip.dvi \
+        viper.dvi \
+        widget.dvi \
+        woman.dvi
+
+
+TEXI2DVI = texi2dvi
 
 # The following rule does not work with all versions of `make'.
 .SUFFIXES: .texi .dvi
 .texi.dvi:
-        texi2dvi $<
+        $(TEXI2DVI) $<
 
-TEXI2DVI = texi2dvi
 ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
-EMACS_XTRA=\
-        $(srcdir)/arevert-xtra.texi \
-        $(srcdir)/cal-xtra.texi \
-        $(srcdir)/dired-xtra.texi \
-        $(srcdir)/picture-xtra.texi \
-        $(srcdir)/emerge-xtra.texi \
-        $(srcdir)/vc-xtra.texi \
-        $(srcdir)/vc1-xtra.texi \
-        $(srcdir)/vc2-xtra.texi \
-        $(srcdir)/fortran-xtra.texi \
-        $(srcdir)/msdog-xtra.texi
-
-EMACSSOURCES= \
-        ${srcdir}/emacs.texi \
-        ${srcdir}/doclicense.texi \
-        ${srcdir}/gpl.texi \
-        ${srcdir}/screen.texi \
-        ${srcdir}/commands.texi \
-        ${srcdir}/entering.texi \
-        ${srcdir}/basic.texi \
-        ${srcdir}/mini.texi \
-        ${srcdir}/m-x.texi \
-        ${srcdir}/help.texi \
-        ${srcdir}/mark.texi \
-        ${srcdir}/killing.texi \
-        ${srcdir}/regs.texi \
-        ${srcdir}/display.texi \
-        ${srcdir}/search.texi \
-        ${srcdir}/fixit.texi \
-        ${srcdir}/files.texi \
-        ${srcdir}/buffers.texi \
-        ${srcdir}/windows.texi \
-        ${srcdir}/frames.texi \
-        ${srcdir}/mule.texi \
-        ${srcdir}/major.texi \
-        ${srcdir}/indent.texi \
-        ${srcdir}/text.texi \
-        ${srcdir}/programs.texi \
-        ${srcdir}/building.texi \
-        ${srcdir}/maintaining.texi \
-        ${srcdir}/abbrevs.texi \
-        ${srcdir}/sending.texi \
-        ${srcdir}/rmail.texi \
-        ${srcdir}/dired.texi \
-        ${srcdir}/calendar.texi \
-        ${srcdir}/misc.texi \
-        ${srcdir}/custom.texi \
-        ${srcdir}/trouble.texi \
-        ${srcdir}/cmdargs.texi \
-        ${srcdir}/xresources.texi \
-        ${srcdir}/anti.texi \
-        ${srcdir}/macos.texi \
-        ${srcdir}/msdog.texi \
-        ${srcdir}/gnu.texi \
-        ${srcdir}/glossary.texi \
-        ${srcdir}/ack.texi \
-        ${srcdir}/kmacro.texi \
-        $(EMACS_XTRA)
-
-info: $(top_srcdir)/info $(INFO_TARGETS)
-
-$(top_srcdir)/info:
+
+info: $(infodir) $(INFO_TARGETS)
+
+$(infodir):
         mkdir $@
 
 dvi: $(DVI_TARGETS)
 
+
 # Note that all the Info targets build the Info files
 # in srcdir.  There is no provision for Info files
 # to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 
-# The following target uses an explicit -o switch to work around
-# the @setfilename directive in info.texi, which is required for
-# the Texinfo distribution.
-
-../info/info: ${INFOSOURCES}
-        cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
-
-info.dvi: ${INFOSOURCES}
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
-
-../info/emacs: ${EMACSSOURCES}
-        cd $(srcdir); $(MAKEINFO) emacs.texi
+## "short" target names for convenience, to just rebuild one manual.
+ada-mode : $(infodir)/ada-mode
+$(infodir)/ada-mode: ada-mode.texi
+        cd $(srcdir); $(MAKEINFO) ada-mode.texi
+ada-mode.dvi: ada-mode.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
 
-emacs.dvi: ${EMACSSOURCES}
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi
+autotype : $(infodir)/autotype
+$(infodir)/autotype: autotype.texi
+        cd $(srcdir); $(MAKEINFO) autotype.texi
+autotype.dvi: autotype.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
 
-# This target is here so you could easily get the list of the *.texi
-# files which belong to the Emacs manual (as opposed to the separate
-# manuals for CL, CC Mode, Ebrowse, etc.).  With this target, you can
-# say things like "grep foo `make emacsman`".
-emacsman:
-        @echo $(EMACSSOURCES)
+calc : $(infodir)/calc
+$(infodir)/calc: calc.texi
+        cd $(srcdir); $(MAKEINFO) calc.texi
+calc.dvi: calc.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
 
-../info/ccmode: cc-mode.texi
+ccmode : $(infodir)/ccmode
+$(infodir)/ccmode: cc-mode.texi
         cd $(srcdir); $(MAKEINFO) cc-mode.texi
 cc-mode.dvi: cc-mode.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi
 
-../info/ada-mode: ada-mode.texi
-        cd $(srcdir); $(MAKEINFO) ada-mode.texi
-ada-mode.dvi: ada-mode.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi
-
-../info/pcl-cvs: pcl-cvs.texi
-        cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
-pcl-cvs.dvi: pcl-cvs.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
-
-../info/eshell: eshell.texi
-        cd $(srcdir); $(MAKEINFO) eshell.texi
-eshell.dvi: eshell.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
-
-../info/cl: cl.texi
+cl : $(infodir)/cl
+$(infodir)/cl: cl.texi
         cd $(srcdir); $(MAKEINFO) cl.texi
 cl.dvi: cl.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi
 
-../info/dired-x: dired-x.texi
+dired-x : $(infodir)/dired-x
+$(infodir)/dired-x: dired-x.texi
         cd $(srcdir); $(MAKEINFO) dired-x.texi
 dired-x.dvi: dired-x.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi
 
-../info/ediff: ediff.texi
+ebrowse : $(infodir)/ebrowse
+$(infodir)/ebrowse: ebrowse.texi
+        cd $(srcdir); $(MAKEINFO) ebrowse.texi
+ebrowse.dvi: ebrowse.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
+
+ediff : $(infodir)/ediff
+$(infodir)/ediff: ediff.texi
         cd $(srcdir); $(MAKEINFO) ediff.texi
 ediff.dvi: ediff.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
 
-emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-xtra.texi
+emacs-mime : $(infodir)/emacs-mime
+$(infodir)/emacs-mime: emacs-mime.texi
+        cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
+emacs-mime.dvi: emacs-mime.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+
+erc : $(infodir)/erc
+$(infodir)/erc: erc.texi
+        cd $(srcdir); $(MAKEINFO) erc.texi
+erc.dvi: erc.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
+
+eshell : $(infodir)/eshell
+$(infodir)/eshell: eshell.texi
+        cd $(srcdir); $(MAKEINFO) eshell.texi
+eshell.dvi: eshell.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi
 
-../info/forms: forms.texi
+eudc : $(infodir)/eudc
+$(infodir)/eudc: eudc.texi
+        cd $(srcdir); $(MAKEINFO) eudc.texi
+eudc.dvi: eudc.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
+
+efaq : $(infodir)/efaq
+$(infodir)/efaq: faq.texi
+        cd $(srcdir); $(MAKEINFO) faq.texi
+faq.dvi: faq.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
+
+flymake : $(infodir)/flymake
+$(infodir)/flymake: flymake.texi
+        cd $(srcdir); $(MAKEINFO) flymake.texi
+flymake.dvi: flymake.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
+
+forms : $(infodir)/forms
+$(infodir)/forms: forms.texi
         cd $(srcdir); $(MAKEINFO) forms.texi
 forms.dvi: forms.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
-../info/gnus: gnus.texi gnus-faq.texi
+gnus : $(infodir)/gnus
+$(infodir)/gnus: gnus.texi gnus-faq.texi
         cd $(srcdir); $(MAKEINFO) gnus.texi
 gnus.dvi: gnus.texi gnus-faq.texi
         sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
@@ -207,162 +241,151 @@ gnus.dvi: gnus.texi gnus-faq.texi
         cp gnustmp.dvi $*.dvi
         rm gnustmp.*
 
-../info/message: message.texi
+# This is produced with --no-split to avoid making files whose
+# names clash on DOS 8+3 filesystems
+idlwave : $(infodir)/idlwave
+$(infodir)/idlwave: idlwave.texi
+        cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
+idlwave.dvi: idlwave.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
+
+# The following target uses an explicit -o switch to work around
+# the @setfilename directive in info.texi, which is required for
+# the Texinfo distribution.
+###info : $(infodir)/info   # circular!
+$(infodir)/info: info.texi
+        cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@
+info.dvi: info.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi
+
+message : $(infodir)/message
+$(infodir)/message: message.texi
         cd $(srcdir); $(MAKEINFO) message.texi
 message.dvi: message.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
 
-../info/sieve: sieve.texi
-        cd $(srcdir); $(MAKEINFO) sieve.texi
-sieve.dvi: sieve.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
+mh-e : $(infodir)/mh-e
+$(infodir)/mh-e: mh-e.texi
+        cd $(srcdir); $(MAKEINFO) mh-e.texi
+mh-e.dvi: mh-e.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
 
-../info/emacs-mime: emacs-mime.texi
-        cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi
-emacs-mime.dvi: emacs-mime.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi
+newsticker : $(infodir)/newsticker
+$(infodir)/newsticker: newsticker.texi
+        cd $(srcdir); $(MAKEINFO) newsticker.texi
+newsticker.dvi: newsticker.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+
+org : $(infodir)/org
+$(infodir)/org: org.texi
+        cd $(srcdir); $(MAKEINFO) org.texi
+org.dvi: org.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+
+pcl-cvs : $(infodir)/pcl-cvs
+$(infodir)/pcl-cvs: pcl-cvs.texi
+        cd $(srcdir); $(MAKEINFO) pcl-cvs.texi
+pcl-cvs.dvi: pcl-cvs.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi
 
-../info/pgg: pgg.texi
+pgg : $(infodir)/pgg
+$(infodir)/pgg: pgg.texi
         cd $(srcdir); $(MAKEINFO) pgg.texi
 pgg.dvi: pgg.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
 
-../info/mh-e: mh-e.texi
-        cd $(srcdir); $(MAKEINFO) mh-e.texi
-mh-e.dvi: mh-e.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi
+rcirc : $(infodir)/rcirc
+$(infodir)/rcirc: rcirc.texi
+        cd $(srcdir); $(MAKEINFO) rcirc.texi
+rcirc.dvi: rcirc.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
 
-../info/reftex: reftex.texi
+reftex : $(infodir)/reftex
+$(infodir)/reftex: reftex.texi
         cd $(srcdir); $(MAKEINFO) reftex.texi
 reftex.dvi: reftex.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi
 
-../info/sc: sc.texi
+sc : $(infodir)/sc
+$(infodir)/sc: sc.texi
         cd $(srcdir); $(MAKEINFO) sc.texi
 sc.dvi: sc.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi
 
-../info/vip: vip.texi
-        cd $(srcdir); $(MAKEINFO) vip.texi
-vip.dvi: vip.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
-
-../info/viper: viper.texi
-        cd $(srcdir); $(MAKEINFO) viper.texi
-viper.dvi: viper.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
-
-../info/widget: widget.texi
-        cd $(srcdir); $(MAKEINFO) widget.texi
-widget.dvi: widget.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
-
-../info/efaq: faq.texi
-        cd $(srcdir); $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-
-../etc/GNU: gnu1.texi gnu.texi
-        cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi
-
-../info/autotype: autotype.texi
-        cd $(srcdir); $(MAKEINFO) autotype.texi
-autotype.dvi: autotype.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi
-
-../info/calc: calc.texi
-        cd $(srcdir); $(MAKEINFO) calc.texi
-
-calc.dvi: calc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi
-
-# This is produced with --no-split to avoid making files whose
-# names clash on DOS 8+3 filesystems
-../info/idlwave: idlwave.texi
-        cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi
-idlwave.dvi: idlwave.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi
-
-../info/eudc: eudc.texi
-        cd $(srcdir); $(MAKEINFO) eudc.texi
-eudc.dvi: eudc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi
-
-../info/ebrowse: ebrowse.texi
-        cd $(srcdir); $(MAKEINFO) ebrowse.texi
-ebrowse.dvi: ebrowse.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi
-
-../info/woman: woman.texi
-        cd $(srcdir); $(MAKEINFO) woman.texi
-woman.dvi: woman.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
+ses : $(infodir)/ses
+$(infodir)/ses: ses.texi
+        cd $(srcdir); $(MAKEINFO) ses.texi
+ses.dvi: ses.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
 
-../info/org: org.texi
-        cd $(srcdir); $(MAKEINFO) org.texi
-org.dvi: org.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi
+sieve : $(infodir)/sieve
+$(infodir)/sieve: sieve.texi
+        cd $(srcdir); $(MAKEINFO) sieve.texi
+sieve.dvi: sieve.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
 
-../info/url: url.texi
-        cd $(srcdir); $(MAKEINFO) url.texi
-url.dvi: url.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
+smtpmail : $(infodir)/smtpmail
+$(infodir)/smtpmail: smtpmail.texi
+        cd $(srcdir); $(MAKEINFO) smtpmail.texi
+smtpmail.dvi: smtpmail.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
 
-../info/speedbar: speedbar.texi
+speedbar : $(infodir)/speedbar
+$(infodir)/speedbar: speedbar.texi
         cd $(srcdir); $(MAKEINFO) speedbar.texi
 speedbar.dvi: speedbar.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi
 
-../info/tramp: tramp.texi trampver.texi
+tramp : $(infodir)/tramp
+$(infodir)/tramp: tramp.texi trampver.texi
         cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi
 tramp.dvi: tramp.texi trampver.texi
         $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi
 
-../info/ses: ses.texi
-        cd $(srcdir); $(MAKEINFO) ses.texi
-ses.dvi: ses.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi
+url : $(infodir)/url
+$(infodir)/url: url.texi
+        cd $(srcdir); $(MAKEINFO) url.texi
+url.dvi: url.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi
 
-../info/smtpmail: smtpmail.texi
-        cd $(srcdir); $(MAKEINFO) smtpmail.texi
-smtpmail.dvi: smtpmail.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi
+vip : $(infodir)/vip
+$(infodir)/vip: vip.texi
+        cd $(srcdir); $(MAKEINFO) vip.texi
+vip.dvi: vip.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi
 
-../info/flymake: flymake.texi
-        cd $(srcdir); $(MAKEINFO) flymake.texi
-flymake.dvi: flymake.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi
+viper : $(infodir)/viper
+$(infodir)/viper: viper.texi
+        cd $(srcdir); $(MAKEINFO) viper.texi
+viper.dvi: viper.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi
 
-../info/newsticker: newsticker.texi
-        cd $(srcdir); $(MAKEINFO) newsticker.texi
-newsticker.dvi: newsticker.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi
+widget : $(infodir)/widget
+$(infodir)/widget: widget.texi
+        cd $(srcdir); $(MAKEINFO) widget.texi
+widget.dvi: widget.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi
 
-../info/rcirc: rcirc.texi
-        cd $(srcdir); $(MAKEINFO) rcirc.texi
-rcirc.dvi: rcirc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi
+woman : $(infodir)/woman
+$(infodir)/woman: woman.texi
+        cd $(srcdir); $(MAKEINFO) woman.texi
+woman.dvi: woman.texi
+        $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi
 
-../info/erc: erc.texi
-        cd $(srcdir); $(MAKEINFO) erc.texi
-erc.dvi: erc.texi
-        $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi
 
 mostlyclean:
-        rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.*
+        rm -f *.log *.cp *.fn *.ky *.op *.ops *.pg *.vr core *.tp \
+        *.tps *.core gnustmp.*
+        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
 
 clean: mostlyclean
         rm -f *.dvi
 
 distclean: clean
+#       rm -f Makefile
 
 maintainer-clean: distclean
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
         for file in $(INFO_TARGETS); do rm -f $${file}*; done
 
 
-# Formerly this directory had texindex.c and getopt.c in it
-# and this makefile built them to make texindex.
-# That caused trouble because this is run entirely in the source directory.
-# Since we expect to get texi2dvi from elsewhere,
-# it is ok to expect texindex from elsewhere also.
+### Makefile ends here