1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
Commit Graph

32 Commits

Author SHA1 Message Date
Stefan Monnier
77ab81d054 Merge from emacs-23 2011-01-14 12:18:41 -05:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
Glenn Morris
8289f37b64 doc/Makefile fixes related to inclusion of emacsver.texi.
* doc/lispref/Makefile.in (elisp.dvi, elisp.pdf): Also include $emacsdir.

* doc/misc/Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
(($(infodir)/calc, calc.dvi, calc.pdf): Depend on emacsver.texi.
($(infodir)/efaq): Remove -I option now in $MAKEINFO.
2010-10-28 00:21:43 -07:00
Glenn Morris
df187c6252 Add explicit -I$srcdir to makeinfo in some doc/ Makefiles.
* doc/emacs/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispintro/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
* doc/lispref/Makefile.in (MAKEINFO): Add explicit -I$srcdir.
2010-10-10 18:57:48 -07:00
Glenn Morris
234db610c6 Add html targets for some doc/ Makefiles.
* doc/lispref/Makefile.in (.PHONY): Add html.
(html, elisp.html): New targets.
(clean): Delete html files.
($(infodir)/elisp): Remove unnecessary includes.

* doc/lispintro/Makefile.in (MAKEINFO): Use --force like the other
doc/ Makefiles do.

* doc/emacs/Makefile.in (.PHONY): Add html.
(html, emacs.html): New targets.
(clean): Delete html files.
2010-10-10 17:43:27 -07:00
Glenn Morris
c12e4a81fe Add ps rules for some doc/ Makefiles.
* doc/misc/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.

* dos/lispref/Makefile.in (DVIPS): New variable.
(.PHONY): Add ps.
(ps, elisp.ps): New targets.
(clean): Delete ps file.

* doc/lispintro/Makefile.in (.dvi.ps): Remove unnecessary suffix rule.
(.PHONY): Add ps.
(ps, emacs-lisp-intro.ps): New targets.
(clean): Delete ps file.

* doc/emacs/Makefile.in (.texi.dvi): Remove unnecessary suffix rule.
(DVIPS): New variable.
(.PHONY): Add ps.
(ps, emacs.ps, emacs-xtra.ps): New targets.
(clean): Delete ps files.
2010-10-10 17:30:34 -07:00
Glenn Morris
c1dc72b395 Replace use of VPATH in most doc/ Makefiles.
* doc/lispref/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/elisp, infoclean): No need to cd $srcdir.

* doc/lispintro/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/eintr, infoclean): No need to cd $srcdir.

* doc/emacs/Makefile.in (VPATH): Remove.
(infodir): Make it absolute.
(mkinfodir, $(infodir)/emacs, infoclean): No need to cd $srcdir.

* doc/misc/Makefile.in: Comment.
2010-10-09 14:19:09 -07:00
Glenn Morris
4393405b96 Anchor regexps in doc/ `make dist' rules.
* doc/emacs/Makefile.in (dist): Anchor regexps.

* doc/lispintro/Makefile.in (dist): Anchor regexps.

* doc/lsipref/Makefile.in (dist): Anchor regexps.
2010-10-09 13:36:14 -07:00
Glenn Morris
208deadc80 * doc/lispref/Makefile.in (dist): Also copy emacsver.texi, and edit $emacsdir. 2010-10-09 13:28:34 -07:00
Glenn Morris
68db69ed24 Remove references to emacsver.texi.in in doc/ `make dist' rules.
* doc/emacs/Makefile.in (dist): Remove reference to emacsver.texi.in.

* doc/lispref/Makefile.in (dist): Remove reference to emacsver.texi.in.
2010-10-09 13:22:11 -07:00
Glenn Morris
eef3ab9443 Use $< in some doc/*/Makefile rules.
* doc/lispref/Makefile.in (srcs): Put elisp.texi first.
($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<.

* doc/lispintro/Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi)
(emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<.

* doc/emacs/Makefile.in (EMACSSOURCES): Put emacs.texi first.
($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi)
(emacs-xtra.pdf): Use $<.
2010-10-09 12:39:42 -07:00
Glenn Morris
5bd2348590 Fix previous doc/*/Makefile.in change. 2010-10-09 12:27:22 -07:00
Glenn Morris
aa9db089bc Quieten emacs-devel.
* doc/misc/Makefile.in (maintainer-clean): Remove harmless, long-standing error.

* doc/lispref/Makefile.in (infoclean): Remove harmless, long-standing error.

* doc/lispintro/Makefile.in (infoclean): Remove harmless, long-standing error.

* doc/emacs/Makefile.in (infoclean): Remove harmless, long-standing error.
2010-10-09 11:39:01 -07:00
Glenn Morris
abd40fb4ee Avoid having a directory as a prerequisite in doc Makefiles.
It does not play well with time-stamping.

* doc/misc/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.  Use it in all the info rules, rather than depending
on infodir.

* doc/lispref/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/elisp): Use $mkinfodir instead of infodir.

* doc/lispintro/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/eintr): Use $mkinfodir instead of infodir.

* doc/emacs/Makefile.in ($(infodir)): Delete rule.
(mkinfodir): New.
($(infodir)/emacs): Use $mkinfodir instead of infodir.
2010-10-09 11:31:12 -07:00
Glenn Morris
b13254e712 Add doc/ dependencies on emacsver.texi.
* doc/misc/Makefile.in ($(infodir)/efaq): Depend on emacsver.texi.

* doc/lispref/Makefile.in (srcs): Add emacsver.texi.

* doc/emacs/Makefile.in (EMACSSOURCES): Add emacsver.texi.
2010-10-08 19:09:46 -07:00
Glenn Morris
f7a31f1108 Set the version number in the texinfo manuals using configure.
* doc/misc/Makefile.in (emacsdir): New variable.
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
* doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi.

* doc/lispref/Makefile.in (emacsdir): New variable.
(MAKEINFO): Add -I $emacsdir.
(dist): Copy emacsver.texi.
* doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi:
* doc/lispref/vol2.texi, doc/lispref/vol1.texi:
Set EMACSVER by including emacsver.texi.

* doc/emacs/emacsver.texi.in: New file.
* doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi.
* doc/emacs/Makefile.in (distclean): Delete emacsver.texi.
(dist): Copy emacsver.texi.

* admin/admin.el (set-version): No need to act on doc/ files any more.

* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
* make-dist: Include doc/emacs/*.texi.in.
2010-10-08 18:41:21 -07:00
Glenn Morris
ea274122d5 Mark some doc/ rules as PHONY.
* doc/misc/Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.

* doc/lispref/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.

* doc/lispintro/Makefile.in (.PHONY): Declare info, dvi, html, pdf, dist.

* doc/emacs/Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
(emacs): Remove rule.
(dist): No need to deal with the emacs rule any more.
2010-10-08 18:02:21 -07:00
Glenn Morris
17ca795035 Include version number in doc `make dist' tarfiles.
* doc/lispref/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/lispintro/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.

* doc/emacs/Makefile.in (version): New, set by configure.
(clean): Delete dist tar file.
(dist): Use version in tar name.
2010-10-06 19:23:28 -07:00
Glenn Morris
8a944cea15 Minor doc/*/Makefile.in change.
* doc/emacs/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispintro/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/lispref/Makefile.in ($(infodir)): Add parallel build workaround.
* doc/misc/Makefile.in ($(infodir)): Add parallel build workaround.
2010-10-05 21:20:46 -07:00
Glenn Morris
4c83f6e1e2 Misc cleanup for doc/*/Makefiles.
* doc/misc/Makefile.in (SHELL): Set it.
(info): Move the mkdir dependency to the individual info files.
(mostlyclean): Tidy up.
(clean): Only delete the specific dvi and pdf files.
(maintainer-clean): Be more restrictive in what we delete.

* doc/lispref/Makefile.in: Rearrange to more closely resemble
doc/emacs/Makefile.
(INSTALL_INFO): Remove unused variable.
(mostlyclean, infoclean, dist): New rules.
(clean): Delete dvi and pdf files.
(maintainer-clean): Remove elisp.oaux, use infoclean.

* doc/lispintro/Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
(INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
($(infodir), html, pdf, infoclean, dist): New rules.
(${infodir}/eintr): Ensure $infodir exists.  Use $@.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $^.
(.PHONY): Declare clean rules.
(mostlyclean): Delete more temp files.
(clean): Delete specific dvi, pdf and html files.
(maintainer-clean): Use infoclean.
(.NOEXPORT): Remove, unused by any other Makefile.in.

* doc/emacs/Makefile.in (EMACS_XTRA): Add the main source file.
(emacs-xtra.dvi, emacs-xtra.pdf): Remove explicit emacs-xtra.texi.
(mostlyclean): No core files, reorder other files.
(clean): Delete specific dvi and pdf files.
(infoclean, dist): New rules.
(maintainer-clean): Use infoclean.
2010-10-05 19:26:38 -07:00
Glenn Morris
8cce34d087 * doc/lispref/Makefile.in ($(infodir)/elisp): Fix -I typo. 2010-10-03 17:55:42 -07:00
Glenn Morris
0264072dee Minor doc Makefile.in clean-up.
* doc/emacs/Makefile.in (SHELL): Set it.
(INFO_TARGETS, DVI_TARGETS): Remove variables.
(info, dvi): Replace above variables with their expansions.
(info): Move mkdir from here...
($(infodir)/emacs): ... to here (for parallel builds).
(pdf): New target.
($(infodir)/emacs): Pass -o option to makeinfo.
(.PHONY): Declare clean rules.
(maintainer-clean): Delete dvi and pdf files.
Guard against cd failures.  Use a more restrictive delete.

* doc/lispref/Makefile.in (dvi, pdf, $(infodir)): New targets.
($(infodir)/elisp): Ensure target directory exists.  Use $@.
(clean): No 'make.out' or 'core' files.
(.PHONY): Declare clean rules.
(maintainer-clean): Delete pdf file.  Guard against cd failures.
2010-10-03 17:49:20 -07:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
64fbeb1627 (TEXI2PDF): New.
(elisp.pdf): New targets.
2009-07-11 20:06:30 +00:00
Glenn Morris
aa514a98a7 (texinfodir): Rename from usermanualdir, and update.
(clean): Add two-volume.make intermediate files.
2009-07-09 03:07:16 +00:00
Glenn Morris
6ed161e1d6 Add 2009 to copyright years. 2009-01-08 05:28:46 +00:00
Glenn Morris
1a87da4c82 (emacsver, miscmanualdir, VERSION, manual, install)
(elisp, dist): Remove rules and variables that are obsolete now
the lisp manual is no longer distributed separately.
2008-06-17 05:59:16 +00:00
Glenn Morris
3bbcada72f (emacsver): New, set by configure.
(manual): Use emacsver.
2008-06-15 02:58:09 +00:00
Glenn Morris
352c8b4a9b Switch to recommended form of GPLv3 permissions notice. 2008-05-16 06:02:53 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
d374a422b2 (infodir): Go up one more level.
(usermanualdir): Change from ../man to ../emacs.
(miscmanualdir): New.
(dist): Use new variable miscmanualdir.
2007-09-06 04:25:46 +00:00
Glenn Morris
b8d4c8d0e9 Move here from ../../lispref 2007-09-06 04:25:08 +00:00