From 8045b9065f59ba0da910cd9bb8dd40f344b5d55f Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 3 May 2012 23:45:03 -0700 Subject: [PATCH] Give info files the .info extension Ref http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00354.html * configure.in (INFO_EXT, INFO_OPTS): New output variables. * doc/emacs/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. (info, infoclean): Use $INFO_EXT. ($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. * doc/emacs/makefile.w32-in (INFO_EXT, INFO_OPTS): New. (INFO_TARGETS): Use $INFO_EXT. ($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT, and -o. * doc/lispintro/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. (info, infoclean): Use $INFO_EXT. (${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. * doc/lispintro/makefile.w32-in (INFO_EXT, INFO_OPTS): New. (INFO_TARGETS, clean): Use $INFO_EXT. ($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. * doc/lispref/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. (info, infoclean): Use $INFO_EXT. ($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. * doc/lispref/makefile.w32-in (INFO_EXT, INFO_OPTS): New. (info, maintainer-clean): Use $INFO_EXT. ($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. * doc/misc/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. (INFO_TARGETS): Use $INFO_EXT. Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. * doc/misc/makefile.w32-in (INFO_EXT, INFO_OPTS): New. (INFO_TARGETS): Use $INFO_EXT. Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. --- ChangeLog | 4 + Makefile.in | 4 +- configure.in | 6 + doc/emacs/ChangeLog | 9 + doc/emacs/Makefile.in | 15 +- doc/emacs/makefile.w32-in | 11 +- doc/lispintro/ChangeLog | 9 + doc/lispintro/Makefile.in | 12 +- doc/lispintro/makefile.w32-in | 12 +- doc/lispref/ChangeLog | 9 + doc/lispref/Makefile.in | 12 +- doc/lispref/makefile.w32-in | 11 +- doc/misc/ChangeLog | 9 + doc/misc/Makefile.in | 461 +++++++++++++++++++--------------- doc/misc/makefile.w32-in | 241 +++++++++--------- 15 files changed, 475 insertions(+), 350 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1286f7dcf5..7ed97f5b29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-04 Glenn Morris + + * configure.in (INFO_EXT, INFO_OPTS): New output variables. + 2012-05-02 Glenn Morris * configure.in (LD_SWITCH_SYSTEM): Don't try to defeat diff --git a/Makefile.in b/Makefile.in index ef1f3c90c6..62e98fd451 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,7 +129,8 @@ man1dir=$(mandir)/man1 # Where to install and expect the info files describing Emacs. infodir=@infodir@ # Info files not in the doc/misc directory (we get those via make echo-info). -INFO_NONMISC=emacs eintr elisp +INFO_EXT=@INFO_EXT@ +INFO_NONMISC=emacs$(INFO_EXT) eintr$(INFO_EXT) elisp$(INFO_EXT) # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". HAVE_MAKEINFO=@HAVE_MAKEINFO@ @@ -904,6 +905,7 @@ check-info-dir: info case $${file} in \ *-[0-9]*|COPYING|dir) continue ;; \ esac ; \ + file=`echo $${file} | sed 's/\.info//'` ; \ grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \ done ; \ if test -n "$${missing}"; then \ diff --git a/configure.in b/configure.in index 2bf78e522e..81e8765990 100644 --- a/configure.in +++ b/configure.in @@ -865,6 +865,12 @@ with the `--without-makeinfo' option to build without the manuals.] ) fi AC_SUBST(HAVE_MAKEINFO) +dnl Just so that there is only a single place we need to edit. +INFO_EXT=.info +INFO_OPTS=--no-split +AC_SUBST(INFO_EXT) +AC_SUBST(INFO_OPTS) + dnl Add our options to ac_link now, after it is set up. if test x$GCC = xyes; then diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 81064afacd..a2bae546f1 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,12 @@ +2012-05-04 Glenn Morris + + * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. + (info, infoclean): Use $INFO_EXT. + ($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. + * makefile.w32-in (INFO_EXT, INFO_OPTS): New. + (INFO_TARGETS): Use $INFO_EXT. + ($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT, and -o. + 2012-05-02 Glenn Morris * emacs.texi (@copying): Only print EDITION in the TeX version. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index b25f6dbe49..0e03efd987 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -35,6 +35,13 @@ infodir = $(srcdir)/../../info # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc +INFO_EXT=@INFO_EXT@ +# Options used only when making info output. +# --no-split is only needed because of MS-DOS. +# For a possible alternative, see +# http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01182.html +INFO_OPTS=@INFO_OPTS@ + # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. MAKEINFO = @MAKEINFO@ @@ -118,7 +125,7 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} .PHONY: info dvi html pdf ps -info: $(infodir)/emacs +info: $(infodir)/emacs$(INFO_EXT) dvi: emacs.dvi html: emacs.html pdf: emacs.pdf @@ -128,9 +135,9 @@ ps: emacs.ps # There is no provision for Info files to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. # Note: "<" is not portable in ordinary make rules. -$(infodir)/emacs: ${EMACSSOURCES} +$(infodir)/emacs$(INFO_EXT): ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs.texi emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi @@ -171,7 +178,7 @@ distclean: clean ## In the standalone tarfile, the clean rule runs this. infoclean: - -cd $(infodir) && rm -f emacs emacs-[1-9] emacs-[1-9][0-9] + -cd $(infodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9] maintainer-clean: distclean infoclean diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in index 488ccbaaf5..4ccecbb7dd 100644 --- a/doc/emacs/makefile.w32-in +++ b/doc/emacs/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Manual -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -30,7 +30,9 @@ infodir = $(srcdir)/../../info MAKEINFO = makeinfo MAKEINFO_OPTS = --force --enable-encoding -I$(srcdir) MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat -INFO_TARGETS = $(infodir)/emacs +INFO_EXT=.info +INFO_OPTS=--no-split +INFO_TARGETS = $(infodir)/emacs$(INFO_EXT) DVI_TARGETS = emacs.dvi INFOSOURCES = info.texi @@ -114,8 +116,8 @@ dvi: $(DVI_TARGETS) $(infodir)/dir: $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS) -$(infodir)/emacs: $(EMACSSOURCES) - $(MAKEINFO) $(MAKEINFO_OPTS) emacs.texi +$(infodir)/emacs$(INFO_EXT): $(EMACSSOURCES) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs.texi emacs.dvi: $(EMACSSOURCES) $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi @@ -129,6 +131,7 @@ emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA) mostlyclean: - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.* +## FIXME $(infodir)/emacs* deletes too much, eg emacs-mime. clean: mostlyclean - $(DEL) *.dvi - $(DEL) $(infodir)/emacs* diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 04b2803a4a..40ec77a515 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,12 @@ +2012-05-04 Glenn Morris + + * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. + (info, infoclean): Use $INFO_EXT. + (${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. + * makefile.w32-in (INFO_EXT, INFO_OPTS): New. + (INFO_TARGETS, clean): Use $INFO_EXT. + ($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. + 2012-05-02 Glenn Morris * emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index c638dd6135..29f5344b8c 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -26,6 +26,10 @@ infodir = $(srcdir)/../../info # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc +INFO_EXT=@INFO_EXT@ +# Options used only when making info output. +INFO_OPTS=@INFO_OPTS@ + MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I $(srcdir) TEXI2DVI = texi2dvi @@ -39,7 +43,7 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} .PHONY: info dvi html pdf ps -info: ${infodir}/eintr +info: ${infodir}/eintr$(INFO_EXT) dvi: emacs-lisp-intro.dvi html: emacs-lisp-intro.html @@ -49,9 +53,9 @@ ps: emacs-lisp-intro.ps # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. # Note: "<" is not portable in ordinary make rules. -${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi +${infodir}/eintr$(INFO_EXT): ${srcdir}/emacs-lisp-intro.texi $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/emacs-lisp-intro.texi emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-lisp-intro.texi @@ -79,7 +83,7 @@ clean: mostlyclean distclean: clean infoclean: - -cd $(infodir) && rm -f eintr eintr-[1-9] + -cd $(infodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9] maintainer-clean: distclean infoclean diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index a8aaf43096..ea9b04b87c 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for the Emacs Lisp Introduction manual. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -24,10 +24,12 @@ infodir = $(srcdir)/../../info # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc +INFO_EXT=.info +INFO_OPTS=--no-split INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing -INFO_TARGETS = $(infodir)/eintr +INFO_TARGETS = $(infodir)/eintr$(INFO_EXT) DVI_TARGETS = emacs-lisp-intro.dvi MAKEINFO = makeinfo @@ -47,8 +49,8 @@ $(infodir)/dir: dvi: $(DVI_TARGETS) -$(infodir)/eintr: $(INFO_SOURCES) - $(MAKEINFO) -o $@ $(srcdir)/emacs-lisp-intro.texi +$(infodir)/eintr$(INFO_EXT): $(INFO_SOURCES) + $(MAKEINFO) $(INFO_OPTS) -o $@ $(srcdir)/emacs-lisp-intro.texi emacs-lisp-intro.dvi: $(INFO_SOURCES) $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi @@ -66,7 +68,7 @@ mostlyclean: - $(DEL) *.log *.cp *.fn *.ky *.pg *.vr *.tp clean: mostlyclean - - $(DEL) *.dvi $(infodir)/eintr* + - $(DEL) *.dvi $(infodir)/eintr$(INFO_EXT)* distclean: clean - $(DEL) makefile diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8c6165c826..77f47cdaae 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,12 @@ +2012-05-04 Glenn Morris + + * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. + (info, infoclean): Use $INFO_EXT. + ($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. + * makefile.w32-in (INFO_EXT, INFO_OPTS): New. + (info, maintainer-clean): Use $INFO_EXT. + ($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT. + 2012-05-04 Chong Yidong * os.texi (Timers): Use defopt for timer-max-repeats. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index a95ba45cfe..19624693aa 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -30,6 +30,10 @@ texinfodir = $(srcdir)/../misc # Directory with emacsver.texi. emacsdir = $(srcdir)/../emacs +INFO_EXT=@INFO_EXT@ +# Options used only when making info output. +INFO_OPTS=@INFO_OPTS@ + MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force --enable-encoding -I $(emacsdir) -I $(srcdir) TEXI2DVI = texi2dvi @@ -99,16 +103,16 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} .PHONY: info dvi pdf ps -info: $(infodir)/elisp +info: $(infodir)/elisp$(INFO_EXT) dvi: elisp.dvi html: elisp.html pdf: elisp.pdf ps: elisp.ps ## Note: "<" is not portable in ordinary make rules. -$(infodir)/elisp: $(srcs) +$(infodir)/elisp$(INFO_EXT): $(srcs) $(mkinfodir) - $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $(srcdir)/elisp.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi elisp.dvi: $(srcs) $(ENVADD) $(TEXI2DVI) $(srcdir)/elisp.texi @@ -138,7 +142,7 @@ clean: mostlyclean distclean: clean infoclean: - -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9] + -cd $(infodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9] maintainer-clean: distclean infoclean diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in index b2c34f3c14..2914852dc8 100644 --- a/doc/lispref/makefile.w32-in +++ b/doc/lispref/makefile.w32-in @@ -28,6 +28,9 @@ emacsdir = $(srcdir)/../emacs # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc +INFO_EXT=.info +INFO_OPTS=--no-split + # Redefine `TEX' if `tex' does not invoke plain TeX. For example: # TEX=platex TEX=tex @@ -102,13 +105,13 @@ srcs = \ # The info file is named `elisp'. -info: $(infodir)/elisp +info: $(infodir)/elisp$(INFO_EXT) $(infodir)/dir: $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp -$(infodir)/elisp: $(srcs) - $(MAKEINFO) $(MAKEINFO_OPTS) -o $(infodir)/elisp $(srcdir)/elisp.texi +$(infodir)/elisp$(INFO_EXT): $(srcs) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $(srcdir)/elisp.texi elisp.dvi: $(srcs) $(texinputdir) $(TEX) $(srcdir)/elisp.texi @@ -123,4 +126,4 @@ distclean: clean - $(DEL) makefile maintainer-clean: distclean - - $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux + - $(DEL) elisp$(INFO_EXT) elisp$(INFO_EXT)-? elisp$(INFO_EXT)-?? elisp.dvi elisp.oaux diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0d6300a1b8..d92e7585b1 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2012-05-04 Glenn Morris + + * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. + (INFO_TARGETS): Use $INFO_EXT. + Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. + * makefile.w32-in (INFO_EXT, INFO_OPTS): New. + (INFO_TARGETS): Use $INFO_EXT. + Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. + 2012-05-02 Glenn Morris * Makefile.in (echo-info): New phony target, used by top-level. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 383ec3a9db..ed1c497c25 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -38,62 +38,66 @@ infodir=../../info ## Currently only used by efaq and calc. emacsdir = $(srcdir)/../emacs +INFO_EXT=@INFO_EXT@ +# Options used only when making info output. +INFO_OPTS=@INFO_OPTS@ + # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. MAKEINFO = @MAKEINFO@ MAKEINFO_OPTS = --force -I$(emacsdir) INFO_TARGETS = \ - $(infodir)/ada-mode \ - $(infodir)/auth \ - $(infodir)/autotype \ - $(infodir)/calc \ - $(infodir)/ccmode \ - $(infodir)/cl \ - $(infodir)/dbus \ - $(infodir)/dired-x \ - $(infodir)/ebrowse \ - $(infodir)/ede \ - $(infodir)/ediff \ - $(infodir)/edt \ - $(infodir)/eieio \ - $(infodir)/emacs-mime \ - $(infodir)/epa \ - $(infodir)/erc \ - $(infodir)/ert \ - $(infodir)/eshell \ - $(infodir)/eudc \ - $(infodir)/efaq \ - $(infodir)/flymake \ - $(infodir)/forms \ - $(infodir)/gnus \ - $(infodir)/emacs-gnutls \ - $(infodir)/idlwave \ - $(infodir)/info \ - $(infodir)/mairix-el \ - $(infodir)/message \ - $(infodir)/mh-e \ - $(infodir)/newsticker \ - $(infodir)/nxml-mode \ - $(infodir)/org \ - $(infodir)/pcl-cvs \ - $(infodir)/pgg \ - $(infodir)/rcirc \ - $(infodir)/remember \ - $(infodir)/reftex \ - $(infodir)/sasl \ - $(infodir)/sc \ - $(infodir)/semantic \ - $(infodir)/ses \ - $(infodir)/sieve \ - $(infodir)/smtpmail \ - $(infodir)/speedbar \ - $(infodir)/tramp \ - $(infodir)/url \ - $(infodir)/vip \ - $(infodir)/viper \ - $(infodir)/widget \ - $(infodir)/woman + $(infodir)/ada-mode$(INFO_EXT) \ + $(infodir)/auth$(INFO_EXT) \ + $(infodir)/autotype$(INFO_EXT) \ + $(infodir)/calc$(INFO_EXT) \ + $(infodir)/ccmode$(INFO_EXT) \ + $(infodir)/cl$(INFO_EXT) \ + $(infodir)/dbus$(INFO_EXT) \ + $(infodir)/dired-x$(INFO_EXT) \ + $(infodir)/ebrowse$(INFO_EXT) \ + $(infodir)/ede$(INFO_EXT) \ + $(infodir)/ediff$(INFO_EXT) \ + $(infodir)/edt$(INFO_EXT) \ + $(infodir)/eieio$(INFO_EXT) \ + $(infodir)/emacs-mime$(INFO_EXT) \ + $(infodir)/epa$(INFO_EXT) \ + $(infodir)/erc$(INFO_EXT) \ + $(infodir)/ert$(INFO_EXT) \ + $(infodir)/eshell$(INFO_EXT) \ + $(infodir)/eudc$(INFO_EXT) \ + $(infodir)/efaq$(INFO_EXT) \ + $(infodir)/flymake$(INFO_EXT) \ + $(infodir)/forms$(INFO_EXT) \ + $(infodir)/gnus$(INFO_EXT) \ + $(infodir)/emacs-gnutls$(INFO_EXT) \ + $(infodir)/idlwave$(INFO_EXT) \ + $(infodir)/info$(INFO_EXT) \ + $(infodir)/mairix-el$(INFO_EXT) \ + $(infodir)/message$(INFO_EXT) \ + $(infodir)/mh-e$(INFO_EXT) \ + $(infodir)/newsticker$(INFO_EXT) \ + $(infodir)/nxml-mode$(INFO_EXT) \ + $(infodir)/org$(INFO_EXT) \ + $(infodir)/pcl-cvs$(INFO_EXT) \ + $(infodir)/pgg$(INFO_EXT) \ + $(infodir)/rcirc$(INFO_EXT) \ + $(infodir)/remember$(INFO_EXT) \ + $(infodir)/reftex$(INFO_EXT) \ + $(infodir)/sasl$(INFO_EXT) \ + $(infodir)/sc$(INFO_EXT) \ + $(infodir)/semantic$(INFO_EXT) \ + $(infodir)/ses$(INFO_EXT) \ + $(infodir)/sieve$(INFO_EXT) \ + $(infodir)/smtpmail$(INFO_EXT) \ + $(infodir)/speedbar$(INFO_EXT) \ + $(infodir)/tramp$(INFO_EXT) \ + $(infodir)/url$(INFO_EXT) \ + $(infodir)/vip$(INFO_EXT) \ + $(infodir)/viper$(INFO_EXT) \ + $(infodir)/widget$(INFO_EXT) \ + $(infodir)/woman$(INFO_EXT) DVI_TARGETS = \ ada-mode.dvi \ @@ -233,190 +237,211 @@ pdf: $(PDF_TARGETS) # Note: "<" is not portable in ordinary make rules. ## "short" target names for convenience, to just rebuild one manual. -ada-mode : $(infodir)/ada-mode -$(infodir)/ada-mode: ada-mode.texi +ada-mode : $(infodir)/ada-mode$(INFO_EXT) +$(infodir)/ada-mode$(INFO_EXT): ada-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ada-mode.texi ada-mode.dvi: ${srcdir}/ada-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi ada-mode.pdf: ${srcdir}/ada-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi -auth : $(infodir)/auth -$(infodir)/auth: auth.texi +auth : $(infodir)/auth$(INFO_EXT) +$(infodir)/auth$(INFO_EXT): auth.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ auth.texi auth.dvi: ${srcdir}/auth.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi auth.pdf: ${srcdir}/auth.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi -autotype : $(infodir)/autotype -$(infodir)/autotype: autotype.texi +autotype : $(infodir)/autotype$(INFO_EXT) +$(infodir)/autotype$(INFO_EXT): autotype.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ autotype.texi autotype.dvi: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi autotype.pdf: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi -calc : $(infodir)/calc -$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi +calc : $(infodir)/calc$(INFO_EXT) +$(infodir)/calc$(INFO_EXT): calc.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ calc.texi calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi -ccmode : $(infodir)/ccmode -$(infodir)/ccmode: cc-mode.texi +ccmode : $(infodir)/ccmode$(INFO_EXT) +$(infodir)/ccmode$(INFO_EXT): cc-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cc-mode.texi cc-mode.dvi: ${srcdir}/cc-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi cc-mode.pdf: ${srcdir}/cc-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi -cl : $(infodir)/cl -$(infodir)/cl: cl.texi +cl : $(infodir)/cl$(INFO_EXT) +$(infodir)/cl$(INFO_EXT): cl.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cl.texi cl.dvi: ${srcdir}/cl.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi cl.pdf: ${srcdir}/cl.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi -dbus : $(infodir)/dbus -$(infodir)/dbus: dbus.texi +dbus : $(infodir)/dbus$(INFO_EXT) +$(infodir)/dbus$(INFO_EXT): dbus.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dbus.texi dbus.dvi: ${srcdir}/dbus.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi dbus.pdf: ${srcdir}/dbus.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi -dired-x : $(infodir)/dired-x -$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi +dired-x : $(infodir)/dired-x$(INFO_EXT) +$(infodir)/dired-x$(INFO_EXT): dired-x.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dired-x.texi dired-x.dvi: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi dired-x.pdf: ${srcdir}/dired-x.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi -ebrowse : $(infodir)/ebrowse -$(infodir)/ebrowse: ebrowse.texi +ebrowse : $(infodir)/ebrowse$(INFO_EXT) +$(infodir)/ebrowse$(INFO_EXT): ebrowse.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ebrowse.texi ebrowse.dvi: ${srcdir}/ebrowse.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi ebrowse.pdf: ${srcdir}/ebrowse.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi -ede : $(infodir)/ede -$(infodir)/ede: ede.texi +ede : $(infodir)/ede$(INFO_EXT) +$(infodir)/ede$(INFO_EXT): ede.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ede.texi ede.dvi: ${srcdir}/ede.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi ede.pdf: ${srcdir}/ede.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi -ediff : $(infodir)/ediff -$(infodir)/ediff: ediff.texi +ediff : $(infodir)/ediff$(INFO_EXT) +$(infodir)/ediff$(INFO_EXT): ediff.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ediff.texi ediff.dvi: ${srcdir}/ediff.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi ediff.pdf: ${srcdir}/ediff.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi -edt : $(infodir)/edt -$(infodir)/edt: edt.texi +edt : $(infodir)/edt$(INFO_EXT) +$(infodir)/edt$(INFO_EXT): edt.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ edt.texi edt.dvi: ${srcdir}/edt.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi edt.pdf: ${srcdir}/edt.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi -eieio : $(infodir)/eieio -$(infodir)/eieio: eieio.texi +eieio : $(infodir)/eieio$(INFO_EXT) +$(infodir)/eieio$(INFO_EXT): eieio.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eieio.texi eieio.dvi: ${srcdir}/eieio.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi eieio.pdf: ${srcdir}/eieio.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi -emacs-gnutls : $(infodir)/emacs-gnutls -$(infodir)/emacs-gnutls: emacs-gnutls.texi +emacs-gnutls : $(infodir)/emacs-gnutls$(INFO_EXT) +$(infodir)/emacs-gnutls$(INFO_EXT): emacs-gnutls.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs-gnutls.texi emacs-gnutls.dvi: ${srcdir}/emacs-gnutls.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-gnutls.texi emacs-gnutls.pdf: ${srcdir}/emacs-gnutls.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-gnutls.texi -emacs-mime : $(infodir)/emacs-mime -$(infodir)/emacs-mime: emacs-mime.texi +emacs-mime : $(infodir)/emacs-mime$(INFO_EXT) +$(infodir)/emacs-mime$(INFO_EXT): emacs-mime.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) --enable-encoding -o $@ emacs-mime.texi emacs-mime.dvi: ${srcdir}/emacs-mime.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi emacs-mime.pdf: ${srcdir}/emacs-mime.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi -epa : $(infodir)/epa -$(infodir)/epa: epa.texi +epa : $(infodir)/epa$(INFO_EXT) +$(infodir)/epa$(INFO_EXT): epa.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ epa.texi epa.dvi: ${srcdir}/epa.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi epa.pdf: ${srcdir}/epa.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi -erc : $(infodir)/erc -$(infodir)/erc: erc.texi +erc : $(infodir)/erc$(INFO_EXT) +$(infodir)/erc$(INFO_EXT): erc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ erc.texi erc.dvi: ${srcdir}/erc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi erc.pdf: ${srcdir}/erc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi -ert : $(infodir)/ert -$(infodir)/ert: ert.texi +ert : $(infodir)/ert$(INFO_EXT) +$(infodir)/ert$(INFO_EXT): ert.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ert.texi ert.dvi: ${srcdir}/ert.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ert.texi ert.pdf: ${srcdir}/ert.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ert.texi -eshell : $(infodir)/eshell -$(infodir)/eshell: eshell.texi +eshell : $(infodir)/eshell$(INFO_EXT) +$(infodir)/eshell$(INFO_EXT): eshell.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eshell.texi eshell.dvi: ${srcdir}/eshell.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi eshell.pdf: ${srcdir}/eshell.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi -eudc : $(infodir)/eudc -$(infodir)/eudc: eudc.texi +eudc : $(infodir)/eudc$(INFO_EXT) +$(infodir)/eudc$(INFO_EXT): eudc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eudc.texi eudc.dvi: ${srcdir}/eudc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi eudc.pdf: ${srcdir}/eudc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi -efaq : $(infodir)/efaq -$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi +efaq : $(infodir)/efaq$(INFO_EXT) +$(infodir)/efaq$(INFO_EXT): faq.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) faq.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ faq.texi faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi @@ -431,29 +456,32 @@ emacs-faq.html: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi emacs-faq.text: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(MAKEINFO) $(MAKEINFO_OPTS) --plaintext -o $@ ${srcdir}/faq.texi -flymake : $(infodir)/flymake -$(infodir)/flymake: flymake.texi +flymake : $(infodir)/flymake$(INFO_EXT) +$(infodir)/flymake$(INFO_EXT): flymake.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ flymake.texi flymake.dvi: ${srcdir}/flymake.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi flymake.pdf: ${srcdir}/flymake.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi -forms : $(infodir)/forms -$(infodir)/forms: forms.texi +forms : $(infodir)/forms$(INFO_EXT) +$(infodir)/forms$(INFO_EXT): forms.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ forms.texi forms.dvi: ${srcdir}/forms.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi forms.pdf: ${srcdir}/forms.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi # gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(infodir)/gnus -$(infodir)/gnus: gnus.texi gnus-faq.texi +gnus : $(infodir)/gnus$(INFO_EXT) +$(infodir)/gnus$(INFO_EXT): gnus.texi gnus-faq.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ gnus.texi gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2DVI) gnustmp.texi @@ -465,240 +493,263 @@ gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi cp gnustmp.pdf $@ rm gnustmp.* -# This is produced with --no-split to avoid making files whose -# names clash on DOS 8+3 filesystems -idlwave : $(infodir)/idlwave -$(infodir)/idlwave: idlwave.texi +# NB this one needs --no-split even without a .info extension. +idlwave : $(infodir)/idlwave$(INFO_EXT) +$(infodir)/idlwave$(INFO_EXT): idlwave.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ idlwave.texi idlwave.dvi: ${srcdir}/idlwave.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi idlwave.pdf: ${srcdir}/idlwave.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi -# The following target uses an explicit -o switch to work around -# the @setfilename directive in info.texi, which is required for -# the Texinfo distribution. -###info : $(infodir)/info # circular! -$(infodir)/info: info.texi +# NB this one needs --no-split even without a .info extension. +info : $(infodir)/info$(INFO_EXT) +$(infodir)/info$(INFO_EXT): info.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ info.texi info.dvi: ${srcdir}/info.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi info.pdf: ${srcdir}/info.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi -mairix-el : $(infodir)/mairix-el -$(infodir)/mairix-el: mairix-el.texi +mairix-el : $(infodir)/mairix-el$(INFO_EXT) +$(infodir)/mairix-el$(INFO_EXT): mairix-el.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mairix-el.texi mairix-el.dvi: ${srcdir}/mairix-el.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi mairix-el.pdf: ${srcdir}/mairix-el.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi -message : $(infodir)/message -$(infodir)/message: message.texi +message : $(infodir)/message$(INFO_EXT) +$(infodir)/message$(INFO_EXT): message.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) message.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ message.texi message.dvi: ${srcdir}/message.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi message.pdf: ${srcdir}/message.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi -mh-e : $(infodir)/mh-e -$(infodir)/mh-e: mh-e.texi +mh-e : $(infodir)/mh-e$(INFO_EXT) +$(infodir)/mh-e$(INFO_EXT): mh-e.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mh-e.texi mh-e.dvi: ${srcdir}/mh-e.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi mh-e.pdf: ${srcdir}/mh-e.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi -newsticker : $(infodir)/newsticker -$(infodir)/newsticker: newsticker.texi +newsticker : $(infodir)/newsticker$(INFO_EXT) +$(infodir)/newsticker$(INFO_EXT): newsticker.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ newsticker.texi newsticker.dvi: ${srcdir}/newsticker.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi newsticker.pdf: ${srcdir}/newsticker.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi -nxml-mode : $(infodir)/nxml-mode -$(infodir)/nxml-mode: nxml-mode.texi +nxml-mode : $(infodir)/nxml-mode$(INFO_EXT) +$(infodir)/nxml-mode$(INFO_EXT): nxml-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ nxml-mode.texi nxml-mode.dvi: ${srcdir}/nxml-mode.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi nxml-mode.pdf: ${srcdir}/nxml-mode.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi -org : $(infodir)/org -$(infodir)/org: org.texi +org : $(infodir)/org$(INFO_EXT) +$(infodir)/org$(INFO_EXT): org.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) org.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ org.texi org.dvi: ${srcdir}/org.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi org.pdf: ${srcdir}/org.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi -pcl-cvs : $(infodir)/pcl-cvs -$(infodir)/pcl-cvs: pcl-cvs.texi +pcl-cvs : $(infodir)/pcl-cvs$(INFO_EXT) +$(infodir)/pcl-cvs$(INFO_EXT): pcl-cvs.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pcl-cvs.texi pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi -pgg : $(infodir)/pgg -$(infodir)/pgg: pgg.texi +pgg : $(infodir)/pgg$(INFO_EXT) +$(infodir)/pgg$(INFO_EXT): pgg.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pgg.texi pgg.dvi: ${srcdir}/pgg.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi pgg.pdf: ${srcdir}/pgg.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi -rcirc : $(infodir)/rcirc -$(infodir)/rcirc: rcirc.texi +rcirc : $(infodir)/rcirc$(INFO_EXT) +$(infodir)/rcirc$(INFO_EXT): rcirc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ rcirc.texi rcirc.dvi: ${srcdir}/rcirc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi rcirc.pdf: ${srcdir}/rcirc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi -reftex : $(infodir)/reftex -$(infodir)/reftex: reftex.texi +reftex : $(infodir)/reftex$(INFO_EXT) +$(infodir)/reftex$(INFO_EXT): reftex.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ reftex.texi reftex.dvi: ${srcdir}/reftex.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi reftex.pdf: ${srcdir}/reftex.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi -remember : $(infodir)/remember -$(infodir)/remember: remember.texi +remember : $(infodir)/remember$(INFO_EXT) +$(infodir)/remember$(INFO_EXT): remember.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ remember.texi remember.dvi: ${srcdir}/remember.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi remember.pdf: ${srcdir}/remember.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi -sasl : $(infodir)/sasl -$(infodir)/sasl: sasl.texi +sasl : $(infodir)/sasl$(INFO_EXT) +$(infodir)/sasl$(INFO_EXT): sasl.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sasl.texi sasl.dvi: ${srcdir}/sasl.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi sasl.pdf: ${srcdir}/sasl.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi -sc : $(infodir)/sc -$(infodir)/sc: sc.texi +sc : $(infodir)/sc$(INFO_EXT) +$(infodir)/sc$(INFO_EXT): sc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sc.texi sc.dvi: ${srcdir}/sc.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi sc.pdf: ${srcdir}/sc.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi -semantic : $(infodir)/semantic -$(infodir)/semantic: semantic.texi sem-user.texi +semantic : $(infodir)/semantic$(INFO_EXT) +$(infodir)/semantic$(INFO_EXT): semantic.texi sem-user.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ semantic.texi semantic.dvi: ${srcdir}/semantic.texi sem-user.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi semantic.pdf: ${srcdir}/semantic.texi sem-user.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi -ses : $(infodir)/ses -$(infodir)/ses: ses.texi +ses : $(infodir)/ses$(INFO_EXT) +$(infodir)/ses$(INFO_EXT): ses.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ses.texi ses.dvi: ${srcdir}/ses.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi ses.pdf: ${srcdir}/ses.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi -sieve : $(infodir)/sieve -$(infodir)/sieve: sieve.texi +sieve : $(infodir)/sieve$(INFO_EXT) +$(infodir)/sieve$(INFO_EXT): sieve.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sieve.texi sieve.dvi: ${srcdir}/sieve.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi sieve.pdf: ${srcdir}/sieve.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi -smtpmail : $(infodir)/smtpmail -$(infodir)/smtpmail: smtpmail.texi +smtpmail : $(infodir)/smtpmail$(INFO_EXT) +$(infodir)/smtpmail$(INFO_EXT): smtpmail.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ smtpmail.texi smtpmail.dvi: ${srcdir}/smtpmail.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi smtpmail.pdf: ${srcdir}/smtpmail.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi -speedbar : $(infodir)/speedbar -$(infodir)/speedbar: speedbar.texi +speedbar : $(infodir)/speedbar$(INFO_EXT) +$(infodir)/speedbar$(INFO_EXT): speedbar.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ speedbar.texi speedbar.dvi: ${srcdir}/speedbar.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi speedbar.pdf: ${srcdir}/speedbar.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi -tramp : $(infodir)/tramp -$(infodir)/tramp: tramp.texi trampver.texi +tramp : $(infodir)/tramp$(INFO_EXT) +$(infodir)/tramp$(INFO_EXT): tramp.texi trampver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs tramp.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ -D emacs tramp.texi tramp.dvi: ${srcdir}/tramp.texi trampver.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi tramp.pdf: ${srcdir}/tramp.texi trampver.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi -url : $(infodir)/url -$(infodir)/url: url.texi +url : $(infodir)/url$(INFO_EXT) +$(infodir)/url$(INFO_EXT): url.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) url.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ url.texi url.dvi: ${srcdir}/url.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi url.pdf: ${srcdir}/url.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi -vip : $(infodir)/vip -$(infodir)/vip: vip.texi +vip : $(infodir)/vip$(INFO_EXT) +$(infodir)/vip$(INFO_EXT): vip.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ vip.texi vip.dvi: ${srcdir}/vip.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi vip.pdf: ${srcdir}/vip.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi -viper : $(infodir)/viper -$(infodir)/viper: viper.texi +viper : $(infodir)/viper$(INFO_EXT) +$(infodir)/viper$(INFO_EXT): viper.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ viper.texi viper.dvi: ${srcdir}/viper.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi viper.pdf: ${srcdir}/viper.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi -widget : $(infodir)/widget -$(infodir)/widget: widget.texi +widget : $(infodir)/widget$(INFO_EXT) +$(infodir)/widget$(INFO_EXT): widget.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ widget.texi widget.dvi: ${srcdir}/widget.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi widget.pdf: ${srcdir}/widget.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi -woman : $(infodir)/woman -$(infodir)/woman: woman.texi +woman : $(infodir)/woman$(INFO_EXT) +$(infodir)/woman$(INFO_EXT): woman.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi + cd $(srcdir); \ + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ woman.texi woman.dvi: ${srcdir}/woman.texi $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi woman.pdf: ${srcdir}/woman.texi diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in index 0f81786cdb..9e577c351b 100644 --- a/doc/misc/makefile.w32-in +++ b/doc/misc/makefile.w32-in @@ -1,6 +1,6 @@ #### -*- Makefile -*- for documentation other than the Emacs manual. -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -30,28 +30,31 @@ infodir = $(srcdir)/../../info ## Currently only used by efaq; could be added to MAKEINFO. emacsdir = $(srcdir)/../emacs +INFO_EXT=.info +INFO_OPTS=--no-split + # The makeinfo program is part of the Texinfo distribution. MAKEINFO = makeinfo MAKEINFO_OPTS = --force -I$(emacsdir) MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat -INFO_TARGETS = $(infodir)/ccmode \ - $(infodir)/cl $(infodir)/dbus $(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 $(infodir)/newsticker $(infodir)/rcirc \ - $(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 $(infodir)/emacs-gnutls +INFO_TARGETS = $(infodir)/ccmode$(INFO_EXT) \ + $(infodir)/cl$(INFO_EXT) $(infodir)/dbus$(INFO_EXT) $(infodir)/dired-x$(INFO_EXT) \ + $(infodir)/ediff$(INFO_EXT) $(infodir)/forms$(INFO_EXT) $(infodir)/gnus$(INFO_EXT) \ + $(infodir)/message$(INFO_EXT) $(infodir)/sieve$(INFO_EXT) $(infodir)/pgg$(INFO_EXT) \ + $(infodir)/emacs-mime$(INFO_EXT) $(infodir)/info$(INFO_EXT) $(infodir)/mh-e$(INFO_EXT) \ + $(infodir)/reftex$(INFO_EXT) $(infodir)/sc$(INFO_EXT) $(infodir)/vip$(INFO_EXT) \ + $(infodir)/viper$(INFO_EXT) $(infodir)/widget$(INFO_EXT) $(infodir)/efaq$(INFO_EXT) \ + $(infodir)/ada-mode$(INFO_EXT) $(infodir)/autotype$(INFO_EXT) $(infodir)/calc$(INFO_EXT) \ + $(infodir)/idlwave$(INFO_EXT) $(infodir)/eudc$(INFO_EXT) $(infodir)/ebrowse$(INFO_EXT) \ + $(infodir)/pcl-cvs$(INFO_EXT) $(infodir)/woman$(INFO_EXT) $(infodir)/eshell$(INFO_EXT) \ + $(infodir)/org$(INFO_EXT) $(infodir)/url$(INFO_EXT) $(infodir)/speedbar$(INFO_EXT) \ + $(infodir)/tramp$(INFO_EXT) $(infodir)/ses$(INFO_EXT) $(infodir)/smtpmail$(INFO_EXT) \ + $(infodir)/flymake$(INFO_EXT) $(infodir)/newsticker$(INFO_EXT) $(infodir)/rcirc$(INFO_EXT) \ + $(infodir)/erc$(INFO_EXT) $(infodir)/ert$(INFO_EXT) \ + $(infodir)/remember$(INFO_EXT) $(infodir)/nxml-mode$(INFO_EXT) \ + $(infodir)/epa$(INFO_EXT) $(infodir)/mairix-el$(INFO_EXT) $(infodir)/sasl$(INFO_EXT) \ + $(infodir)/auth$(INFO_EXT) $(infodir)/eieio$(INFO_EXT) $(infodir)/ede$(INFO_EXT) \ + $(infodir)/semantic$(INFO_EXT) $(infodir)/edt$(INFO_EXT) $(infodir)/emacs-gnutls$(INFO_EXT) DVI_TARGETS = calc.dvi cc-mode.dvi cl.dvi dbus.dvi dired-x.dvi \ ediff.dvi forms.dvi gnus.dvi message.dvi emacs-mime.dvi \ sieve.dvi pgg.dvi mh-e.dvi \ @@ -93,68 +96,68 @@ $(infodir)/dir: # Some Windows ports of makeinfo seem to require -o to come before the # texi filename, contrary to GNU standards. -$(infodir)/info: $(INFOSOURCES) - $(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi +$(infodir)/info$(INFO_EXT): $(INFOSOURCES) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ info.texi info.dvi: $(INFOSOURCES) $(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi -$(infodir)/ccmode: cc-mode.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi +$(infodir)/ccmode$(INFO_EXT): cc-mode.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cc-mode.texi cc-mode.dvi: cc-mode.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi -$(infodir)/ada-mode: ada-mode.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi +$(infodir)/ada-mode$(INFO_EXT): ada-mode.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ada-mode.texi ada-mode.dvi: ada-mode.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi -$(infodir)/pcl-cvs: pcl-cvs.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi +$(infodir)/pcl-cvs$(INFO_EXT): pcl-cvs.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pcl-cvs.texi pcl-cvs.dvi: pcl-cvs.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi -$(infodir)/eshell: eshell.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi +$(infodir)/eshell$(INFO_EXT): eshell.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eshell.texi eshell.dvi: eshell.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi -$(infodir)/cl: cl.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) cl.texi +$(infodir)/cl$(INFO_EXT): cl.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ cl.texi cl.dvi: cl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi -$(infodir)/dbus: dbus.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi +$(infodir)/dbus$(INFO_EXT): dbus.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dbus.texi dbus.dvi: dbus.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/dbus.texi -$(infodir)/dired-x: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi +$(infodir)/dired-x$(INFO_EXT): dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ dired-x.texi dired-x.dvi: dired-x.texi $(emacsdir)/emacsver.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi -$(infodir)/ediff: ediff.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi +$(infodir)/ediff$(INFO_EXT): ediff.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ediff.texi ediff.dvi: ediff.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi -$(infodir)/flymake: flymake.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi +$(infodir)/flymake$(INFO_EXT): flymake.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ flymake.texi flymake.dvi: flymake.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/flymake.texi -$(infodir)/forms: forms.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) forms.texi +$(infodir)/forms$(INFO_EXT): forms.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ forms.texi forms.dvi: forms.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi # gnus/message/emacs-mime/sieve/pgg are part of Gnus: -$(infodir)/gnus: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ +$(infodir)/gnus$(INFO_EXT): gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \ doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ gnus.texi gnus.dvi: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ sieve.texi pgg.texi sasl.texi gnus-news.texi gnus-faq.texi \ doclicense.texi @@ -163,195 +166,195 @@ gnus.dvi: gnus.texi gnus-overrides.texi message.texi emacs-mime.texi \ cp gnustmp.dvi $*.dvi rm gnustmp.* # -$(infodir)/message: message.texi gnus-overrides.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) message.texi +$(infodir)/message$(INFO_EXT): message.texi gnus-overrides.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ message.texi message.dvi: message.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi # -$(infodir)/emacs-mime: emacs-mime.texi gnus-overrides.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi +$(infodir)/emacs-mime$(INFO_EXT): emacs-mime.texi gnus-overrides.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ --enable-encoding emacs-mime.texi emacs-mime.dvi: emacs-mime.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi # -$(infodir)/sieve: sieve.texi gnus-overrides.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi +$(infodir)/sieve$(INFO_EXT): sieve.texi gnus-overrides.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sieve.texi sieve.dvi: sieve.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sieve.texi # -$(infodir)/pgg: pgg.texi gnus-overrides.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi +$(infodir)/pgg$(INFO_EXT): pgg.texi gnus-overrides.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ pgg.texi pgg.dvi: pgg.texi gnus-overrides.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/pgg.texi -$(infodir)/mh-e: mh-e.texi doclicense.texi gpl.texi - $(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi +$(infodir)/mh-e$(INFO_EXT): mh-e.texi doclicense.texi gpl.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mh-e.texi mh-e.dvi: mh-e.texi doclicense.texi gpl.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi -$(infodir)/reftex: reftex.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi +$(infodir)/reftex$(INFO_EXT): reftex.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ reftex.texi reftex.dvi: reftex.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi -$(infodir)/remember: remember.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) remember.texi +$(infodir)/remember$(INFO_EXT): remember.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ remember.texi remember.dvi: remember.texi doclicense.texix $(ENVADD) $(TEXI2DVI) $(srcdir)/remember.texi -$(infodir)/sasl: sasl.texi gnus-overrides.texi - $(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi +$(infodir)/sasl$(INFO_EXT): sasl.texi gnus-overrides.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sasl.texi sasl.dvi: sasl.texi gnus-overrides.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sasl.texi -$(infodir)/sc: sc.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) sc.texi +$(infodir)/sc$(INFO_EXT): sc.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ sc.texi sc.dvi: sc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi -$(infodir)/vip: vip.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) vip.texi +$(infodir)/vip$(INFO_EXT): vip.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ vip.texi vip.dvi: vip.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi -$(infodir)/viper: viper.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) viper.texi +$(infodir)/viper$(INFO_EXT): viper.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ viper.texi viper.dvi: viper.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi -$(infodir)/widget: widget.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) widget.texi +$(infodir)/widget$(INFO_EXT): widget.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ widget.texi widget.dvi: widget.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi -$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi - $(MAKEINFO) $(MAKEINFO_OPTS) faq.texi +$(infodir)/efaq$(INFO_EXT): faq.texi $(emacsdir)/emacsver.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ faq.texi faq.dvi: faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi -$(infodir)/autotype: autotype.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi +$(infodir)/autotype$(INFO_EXT): autotype.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ autotype.texi autotype.dvi: autotype.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi -$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) calc.texi +$(infodir)/calc$(INFO_EXT): calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ calc.texi calc.dvi: calc.texi $(emacsdir)/emacsver.texi gpl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi # This is produced with --no-split to avoid making files whose # names clash on DOS 8+3 filesystems -$(infodir)/idlwave: idlwave.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi +$(infodir)/idlwave$(INFO_EXT): idlwave.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ idlwave.texi idlwave.dvi: idlwave.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi -$(infodir)/eudc: eudc.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi +$(infodir)/eudc$(INFO_EXT): eudc.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eudc.texi eudc.dvi: eudc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi -$(infodir)/ebrowse: ebrowse.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi +$(infodir)/ebrowse$(INFO_EXT): ebrowse.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ebrowse.texi ebrowse.dvi: ebrowse.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi -$(infodir)/woman: woman.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) woman.texi +$(infodir)/woman$(INFO_EXT): woman.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ woman.texi woman.dvi: woman.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi -$(infodir)/speedbar: speedbar.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi +$(infodir)/speedbar$(INFO_EXT): speedbar.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ speedbar.texi speedbar.dvi: speedbar.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi -$(infodir)/tramp: tramp.texi trampver.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) tramp.texi +$(infodir)/tramp$(INFO_EXT): tramp.texi trampver.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ tramp.texi tramp.dvi: tramp.texi trampver.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi -$(infodir)/ses: ses.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ses.texi +$(infodir)/ses$(INFO_EXT): ses.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ses.texi ses.dvi: ses.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi -$(infodir)/smtpmail: smtpmail.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi +$(infodir)/smtpmail$(INFO_EXT): smtpmail.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ smtpmail.texi smtpmail.dvi: smtpmail.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi -$(infodir)/org: org.texi - $(MAKEINFO) $(MAKEINFO_OPTS) org.texi +$(infodir)/org$(INFO_EXT): org.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ org.texi org.dvi: org.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/org.texi -$(infodir)/url: url.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) url.texi +$(infodir)/url$(INFO_EXT): url.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ url.texi url.dvi: url.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/url.texi -$(infodir)/newsticker: newsticker.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi +$(infodir)/newsticker$(INFO_EXT): newsticker.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ newsticker.texi newsticker.dvi: newsticker.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi -$(infodir)/nxml-mode: nxml-mode.texi - $(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi +$(infodir)/nxml-mode$(INFO_EXT): nxml-mode.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ nxml-mode.texi nxml-mod.dvi: nxml-mode.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/nxml-mode.texi -$(infodir)/rcirc: rcirc.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi +$(infodir)/rcirc$(INFO_EXT): rcirc.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ rcirc.texi rcirc.dvi: rcirc.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/rcirc.texi -$(infodir)/erc: erc.texi gpl.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) erc.texi +$(infodir)/erc$(INFO_EXT): erc.texi gpl.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ erc.texi erc.dvi: erc.texi gpl.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/erc.texi -$(infodir)/ert: ert.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ert.texi +$(infodir)/ert$(INFO_EXT): ert.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ert.texi ert.dvi: ert.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ert.texi -$(infodir)/epa: epa.texi - $(MAKEINFO) $(MAKEINFO_OPTS) epa.texi +$(infodir)/epa$(INFO_EXT): epa.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ epa.texi epa.dvi: epa.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/epa.texi -$(infodir)/mairix-el: mairix-el.texi - $(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi +$(infodir)/mairix-el$(INFO_EXT): mairix-el.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ mairix-el.texi mairix-el.dvi: mairix-el.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/mairix-el.texi -$(infodir)/auth: auth.texi gnus-overrides.texi - $(MAKEINFO) $(MAKEINFO_OPTS) auth.texi +$(infodir)/auth$(INFO_EXT): auth.texi gnus-overrides.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ auth.texi auth.dvi: auth.texi gnus-overrides.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/auth.texi -$(infodir)/eieio: eieio.texi - $(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi +$(infodir)/eieio$(INFO_EXT): eieio.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ eieio.texi eieio.dvi: eieio.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/eieio.texi -$(infodir)/ede: ede.texi - $(MAKEINFO) $(MAKEINFO_OPTS) ede.texi +$(infodir)/ede$(INFO_EXT): ede.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ede.texi ede.dvi: ede.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/ede.texi -$(infodir)/semantic: semantic.texi sem-user.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi +$(infodir)/semantic$(INFO_EXT): semantic.texi sem-user.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ semantic.texi semantic.dvi: semantic.texi sem-user.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/semantic.texi -$(infodir)/edt: edt.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) edt.texi +$(infodir)/edt$(INFO_EXT): edt.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ edt.texi edt.dvi: edt.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi -$(infodir)/emacs-gnutls: emacs-gnutls.texi doclicense.texi - $(MAKEINFO) $(MAKEINFO_OPTS) emacs-gnutls.texi +$(infodir)/emacs-gnutls$(INFO_EXT): emacs-gnutls.texi doclicense.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ emacs-gnutls.texi emacs-gnutls.dvi: emacs-gnutls.texi doclicense.texi $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-gnutls.texi -- 2.20.1