Merge changes mistakenly made to `Makefile'.

(INFO_TARGETS): Change ../info/custom to ../info/customize.
(../info/customize): Renamed from ../info/custom.
(../info/viper, viper.dvi): Remove dependency on viper-cmd.texi.

diff --git a/man/Makefile.in b/man/Makefile.in
index aebd2cf3179cf32d867985c8cccb5a4bc85b2402..c9c7855d3e30cdc7fabd5e340394e9d553c11d0b 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -15,7 +15,7 @@ MAKEINFO = makeinfo
 INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl ../info/dired-x \
               ../info/ediff ../info/forms ../info/gnus ../info/info \
               ../info/mh-e ../info/sc ../info/vip ../info/viper \
-              ../info/message ../info/custom ../info/widget
+              ../info/message ../info/customize ../info/widget
 DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi ediff.dvi forms.dvi \
                 gnus.dvi mh-e.dvi sc.dvi vip.dvi viper.dvi message.dvi \
                 customize.dvi widget.dvi
@@ -98,6 +98,11 @@ cc-mode.dvi: cc-mode.texi
 cl.dvi: cl.texi
        TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/cl.texi
 
+../info/customize: customize.texi
+       cd $(srcdir); $(MAKEINFO) customize.texi
+customize.dvi: customize.texi
+       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/customize.texi
+
 ../info/dired-x: dired-x.texi
        cd $(srcdir); $(MAKEINFO) dired-x.texi
 dired-x.dvi: dired-x.texi
@@ -113,6 +118,16 @@ ediff.dvi: ediff.texi
 forms.dvi: forms.texi
        TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/forms.texi
 
+../info/gnus: gnus.texi
+       cd $(srcdir); $(MAKEINFO) gnus.texi
+gnus.dvi: gnus.texi
+       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/gnus.texi
+
+../info/message: message.texi
+       cd $(srcdir); $(MAKEINFO) message.texi
+message.dvi: message.texi
+       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/message.texi
+
 ../info/mh-e: mh-e.texi
        cd $(srcdir); $(MAKEINFO) mh-e.texi
 mh-e.dvi: mh-e.texi
@@ -128,34 +143,19 @@ sc.dvi: sc.texi
 vip.dvi: vip.texi
        TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/vip.texi
 
-../info/gnus: gnus.texi
-       cd $(srcdir); $(MAKEINFO) gnus.texi
-gnus.dvi: gnus.texi
-       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/gnus.texi
-
-../info/message: message.texi
-       cd $(srcdir); $(MAKEINFO) message.texi
-message.dvi: message.texi
-       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/message.texi
+../info/viper: viper.texi
+       cd $(srcdir); $(MAKEINFO) viper.texi
+viper.dvi: viper.texi
+       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/viper.texi
 
 ../info/widget: widget.texi
        cd $(srcdir); $(MAKEINFO) widget.texi
 widget.dvi: widget.texi
        TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/widget.texi
 
-../info/custom: customize.texi
-       cd $(srcdir); $(MAKEINFO) customize.texi
-customize.dvi: customize.texi
-       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/customize.texi
-
 ../etc/GNU: gnu1.texi gnu.texi
        makeinfo --no-headers -o ../etc/GNU gnu1.texi
 
-../info/viper: viper.texi viper-cmd.texi
-       cd $(srcdir); $(MAKEINFO) viper.texi
-viper.dvi: viper.texi viper-cmd.texi
-       TEXINPUTS="$(srcdir) $(TEXINPUTS)"; $(TEXI2DVI) ${srcdir}/viper.texi
-
 mostlyclean:
        rm -f *.log *.cp *.fn *.ky *.pg *.vr core