(MAKEINFO): Use --force.

(INFO_TARGETS, DVI_TARGETS): Make identical to the lists in Makefile.in.
(gnus.dvi): Use "..." to quote Sed args, so that it works with more shells.

1 files changed, 18 insertions, 23 deletions

diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index d89c77ab5d9..9771be8ef06 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -29,33 +29,28 @@ srcdir=.
 infodir = $(srcdir)/../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo
+MAKEINFO = makeinfo --force
 MULTI_INSTALL_INFO = $(srcdir)\..\nt\multi-install-info.bat
-INFO_TARGETS = $(infodir)/emacs $(infodir)/ccmode \
-                $(infodir)/cl $(infodir)/dired-x \
-                $(infodir)/ediff $(infodir)/forms \
-                $(infodir)/gnus $(infodir)/info \
-                $(infodir)/message $(infodir)/mh-e \
-                $(infodir)/reftex $(infodir)/sc \
-                $(infodir)/vip $(infodir)/viper \
-                $(infodir)/widget $(infodir)/efaq \
-                $(infodir)/ada-mode $(infodir)/autotype \
-                $(infodir)/calc $(infodir)/idlwave \
-                $(infodir)/eudc $(infodir)/ebrowse \
-                $(infodir)/pcl-cvs $(infodir)/woman \
-                $(infodir)/emacs-mime $(infodir)/eshell \
-                $(infodir)/speedbar $(infodir)/tramp \
-                $(infodir)/ses $(infodir)/smtpmail \
-                $(infodir)/flymake $(infodir)/emacs-xtra \
-                $(infodir)/org $(infodir)/url \
-                $(infodir)/pgg $(infodir)/sieve
+INFO_TARGETS = $(infodir)/emacs $(infodir)/emacs-xtra $(infodir)/ccmode \
+                $(infodir)/cl $(infodir)/dired-x $(infodir)/ediff \
+                $(infodir)/forms $(infodir)/gnus $(infodir)/message \
+                $(infodir)/sieve $(infodir)/pgg $(infodir)/emacs-mime \
+                $(infodir)/info $(infodir)/mh-e $(infodir)/reftex \
+                $(infodir)/sc $(infodir)/vip $(infodir)/viper \
+                $(infodir)/widget $(infodir)/efaq $(infodir)/ada-mode \
+                $(infodir)/autotype $(infodir)/calc $(infodir)/idlwave \
+                $(infodir)/eudc $(infodir)/ebrowse $(infodir)/pcl-cvs \
+                $(infodir)/woman $(infodir)/eshell $(infodir)/org \
+                $(infodir)/url $(infodir)/speedbar $(infodir)/tramp \
+                $(infodir)/ses $(infodir)/smtpmail $(infodir)/flymake
 DVI_TARGETS =   emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-                 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.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 \
-                 org.dvi pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
+                 pcl-cvs.dvi woman.dvi eshell.dvi org.dvi url.dvi \
                  speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
-                 emacs-xtra.dvi pgg.dvi sieve.dvi url.dvi
+                 emacs-xtra.dvi
 INFOSOURCES = info.texi
 
 # The following rule does not work with all versions of `make'.
@@ -197,7 +192,7 @@ forms.dvi: forms.texi
 $(infodir)/gnus: gnus.texi
         $(MAKEINFO) gnus.texi
 gnus.dvi: gnus.texi
-        sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi
+        sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi
         $(ENVADD) $(TEXI2DVI) gnustmp.texi
         cp gnustmp.dvi $*.dvi
         rm gnustmp.*