[Emacs-diffs] Changes to emacs/man/makefile.w32-in

[Eli Zaretskii]

Index: emacs/man/makefile.w32-in
diff -c emacs/man/makefile.w32-in:1.17 emacs/man/makefile.w32-in:1.18
*** emacs/man/makefile.w32-in:1.17      Thu Dec  9 01:54:47 2004
--- emacs/man/makefile.w32-in   Fri Jun 24 20:23:30 2005
***************
*** 29,61 ****
  infodir = $(srcdir)/../info
  
  # The makeinfo program is part of the Texinfo distribution.
! MAKEINFO = makeinfo
  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
  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 \
                 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 \
                 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi flymake.dvi \
!                emacs-xtra.dvi pgg.dvi sieve.dvi url.dvi
  INFOSOURCES = info.texi
  
  # The following rule does not work with all versions of `make'.
--- 29,56 ----
  infodir = $(srcdir)/../info
  
  # The makeinfo program is part of the Texinfo distribution.
! MAKEINFO = makeinfo --force
  MULTI_INSTALL_INFO = $(srcdir)\..\nt\multi-install-info.bat
! 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 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 \
!                  emacs-xtra.dvi
  INFOSOURCES = info.texi
  
  # The following rule does not work with all versions of `make'.
***************
*** 197,203 ****
  $(infodir)/gnus: gnus.texi
        $(MAKEINFO) gnus.texi
  gnus.dvi: gnus.texi
!       sed -e '/@iflatex/,/@end iflatex/d' $(srcdir)/gnus.texi > gnustmp.texi
        $(ENVADD) $(TEXI2DVI) gnustmp.texi
        cp gnustmp.dvi $*.dvi
        rm gnustmp.*
--- 192,198 ----
  $(infodir)/gnus: gnus.texi
        $(MAKEINFO) gnus.texi
  gnus.dvi: gnus.texi
!       sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi
        $(ENVADD) $(TEXI2DVI) gnustmp.texi
        cp gnustmp.dvi $*.dvi
        rm gnustmp.*