Merge from emacs-23

[gnu-emacs] / doc / misc / Makefile.in

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 023831b9366cb4bd5f650d5d2e5bad91ffc05c7b..4ba74539b00560ec73550013794759d7e14897a4 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,8 +1,7 @@
 #### Makefile for documentation other than the Emacs manual.
 
 # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,18 +26,22 @@ SHELL = /bin/sh
 srcdir=@srcdir@
 
 # Tell make where to find source files; this is needed for the makefiles.
+# Note the other doc Makefiles do not use VPATH anymore, instead
+# they set infodir to an absolute path.  Not doing that here in
+# case INFO_TARGETS gets too long for some feeble shells.
+# (cf src/Makefile.in's shortlisp)
 VPATH=@srcdir@
 
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
 infodir=../../info
 ## Directory with emacsver.texi.
-## Currently only used by efaq; could be added to MAKEINFO.
+## Currently only used by efaq and calc.
 emacsdir = $(srcdir)/../emacs
 
 # The makeinfo program is part of the Texinfo distribution.
 # Use --force so that it generates output even if there are errors.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force -I$(emacsdir)
 
 # Also add new entries to INFO_FILES in the top-level Makefile.in.
 INFO_TARGETS = \
@@ -58,6 +61,7 @@ INFO_TARGETS = \
        $(infodir)/emacs-mime \
        $(infodir)/epa \
        $(infodir)/erc \
+       $(infodir)/ert \
        $(infodir)/eshell \
        $(infodir)/eudc \
        $(infodir)/efaq \
@@ -108,6 +112,7 @@ DVI_TARGETS = \
        emacs-mime.dvi \
        epa.dvi \
        erc.dvi \
+       ert.dvi \
        eshell.dvi \
        eudc.dvi \
        faq.dvi \
@@ -158,6 +163,7 @@ PDF_TARGETS = \
        emacs-mime.pdf \
        epa.pdf \
        erc.pdf \
+       ert.pdf \
        eshell.pdf \
        eudc.pdf \
        faq.pdf \
@@ -194,12 +200,7 @@ PDF_TARGETS = \
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
 
-# The following rule does not work with all versions of `make'.
-.SUFFIXES: .texi .dvi
-.texi.dvi:
-       $(TEXI2DVI) $<
-
-ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
+ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
 
@@ -245,12 +246,12 @@ autotype.pdf: ${srcdir}/autotype.texi
        $(ENVADD) $(TEXI2PDF) $<
 
 calc : $(infodir)/calc
-$(infodir)/calc: calc.texi
+$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
        $(mkinfodir)
        cd $(srcdir); $(MAKEINFO) $<
-calc.dvi: ${srcdir}/calc.texi
+calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) $<
-calc.pdf: ${srcdir}/calc.texi
+calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2PDF) $<
 
 ccmode : $(infodir)/ccmode
@@ -310,11 +311,11 @@ ede.pdf: ${srcdir}/ede.texi
 ediff : $(infodir)/ediff
 $(infodir)/ediff: ediff.texi
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) ediff.texi
-ediff.dvi: ediff.texi
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi
-ediff.pdf: ediff.texi
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi
+       cd $(srcdir); $(MAKEINFO) $<
+ediff.dvi: ${srcdir}/ediff.texi
+       $(ENVADD) $(TEXI2DVI) $<
+ediff.pdf: ${srcdir}/ediff.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 edt : $(infodir)/edt
 $(infodir)/edt: edt.texi
@@ -346,11 +347,11 @@ emacs-mime.pdf: ${srcdir}/emacs-mime.texi
 epa : $(infodir)/epa
 $(infodir)/epa: epa.texi
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) epa.texi
-epa.dvi: epa.texi
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi
-epa.pdf: epa.texi
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi
+       cd $(srcdir); $(MAKEINFO) $<
+epa.dvi: ${srcdir}/epa.texi
+       $(ENVADD) $(TEXI2DVI) $<
+epa.pdf: ${srcdir}/epa.texi
+       $(ENVADD) $(TEXI2PDF) $<
 
 erc : $(infodir)/erc
 $(infodir)/erc: erc.texi
@@ -361,6 +362,14 @@ erc.dvi: ${srcdir}/erc.texi
 erc.pdf: ${srcdir}/erc.texi
        $(ENVADD) $(TEXI2PDF) $<
 
+ert : $(infodir)/ert
+$(infodir)/ert: ert.texi $(infodir)
+       cd $(srcdir); $(MAKEINFO) ert.texi
+ert.dvi: ert.texi
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi
+ert.pdf: ert.texi
+       $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi
+
 eshell : $(infodir)/eshell
 $(infodir)/eshell: eshell.texi
        $(mkinfodir)
@@ -382,7 +391,7 @@ eudc.pdf: ${srcdir}/eudc.texi
 efaq : $(infodir)/efaq
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
        $(mkinfodir)
-       cd $(srcdir); $(MAKEINFO) -I $(emacsdir) $<
+       cd $(srcdir); $(MAKEINFO) $<
 faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
        $(ENVADD) $(TEXI2DVI) $<
 faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi