Merge from emacs-23

[gnu-emacs] / doc / misc / makefile.w32-in

diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 942847976e76c47dd9c126d2d94065c222f0e6a7..bd08259a84bd411b03823a824489b061c4b8e9b2 100644 (file)
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -27,8 +27,12 @@ srcdir=.
 
 infodir = $(srcdir)/../../info
 
+## Directory with emacsver.texi.
+## Currently only used by efaq; could be added to MAKEINFO.
+emacsdir = $(srcdir)/../emacs
+
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force -I$(emacsdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/ccmode \
                $(infodir)/cl $(infodir)/dbus $(infodir)/dired-x \
@@ -43,7 +47,8 @@ INFO_TARGETS = $(infodir)/ccmode \
                $(infodir)/org $(infodir)/url $(infodir)/speedbar \
                $(infodir)/tramp $(infodir)/ses $(infodir)/smtpmail \
                $(infodir)/flymake $(infodir)/newsticker $(infodir)/rcirc \
-               $(infodir)/erc $(infodir)/remember $(infodir)/nxml-mode \
+               $(infodir)/erc $(infodir)/ert \
+               $(infodir)/remember $(infodir)/nxml-mode \
                $(infodir)/epa $(infodir)/mairix-el $(infodir)/sasl \
                $(infodir)/auth $(infodir)/eieio $(infodir)/ede \
                $(infodir)/semantic $(infodir)/edt
@@ -54,7 +59,8 @@ DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.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 rcirc.dvi erc.dvi remember.dvi nxml-mode.dvi \
+               newsticker.dvi rcirc.dvi erc.dvi ert.dvi \
+               remember.dvi nxml-mode.dvi \
                epa.dvi mairix-el.dvi sasl.dvi auth.dvi eieio.dvi ede.dvi \
                semantic.dvi edt.dvi
 INFOSOURCES = info.texi
@@ -213,9 +219,9 @@ $(infodir)/widget: widget.texi
 widget.dvi: widget.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
-$(infodir)/efaq: faq.texi
+$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
        $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
+faq.dvi: faq.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
 $(infodir)/autotype: autotype.texi
@@ -223,10 +229,10 @@ $(infodir)/autotype: autotype.texi
 autotype.dvi: autotype.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
 
-$(infodir)/calc: calc.texi
+$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
        $(MAKEINFO) calc.texi
 
-calc.dvi: calc.texi
+calc.dvi: calc.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
 
 # This is produced with --no-split to avoid making files whose
@@ -301,6 +307,11 @@ $(infodir)/erc: erc.texi
 erc.dvi: erc.texi
        $(ENVADD) $(TEXI2DVI) $(srcdir)/erc.texi
 
+$(infodir)/ert: ert.texi
+       $(MAKEINFO) ert.texi
+ert.dvi: ert.texi
+       $(ENVADD) $(TEXI2DVI) $(srcdir)/ert.texi
+
 $(infodir)/epa: epa.texi
        $(MAKEINFO) epa.texi
 epa.dvi: epa.texi
@@ -358,7 +369,7 @@ clean: mostlyclean
                 $(infodir)/url* $(infodir)/org* \
                 $(infodir)/flymake* $(infodir)/newsticker* \
                 $(infodir)/sieve* $(infodir)/pgg* \
-                $(infodir)/erc* $(infodir)/rcirc* \
+                $(infodir)/erc* $(infodir)/ert* $(infodir)/rcirc* \
                 $(infodir)/remember* $(infodir)/nxml-mode* \
                 $(infodir)/epa* $(infodir)/sasl* \
                 $(infodir)/mairix-el* $(infodir)/auth* \