From 4393405b96ac5e64c84bf4896a028d8375af3b78 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 9 Oct 2010 13:36:14 -0700 Subject: [PATCH] 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. --- doc/emacs/ChangeLog | 2 ++ doc/emacs/Makefile.in | 4 ++-- doc/lispintro/ChangeLog | 2 ++ doc/lispintro/Makefile.in | 4 ++-- doc/lispref/ChangeLog | 2 ++ doc/lispref/Makefile.in | 6 +++--- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 325ca1227fd..6dc2ac11ed6 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (dist): Anchor regexps. + * Makefile.in (EMACSSOURCES): Put emacs.texi first. ($(infodir)/emacs, emacs.dvi, emacs.pdf, emacs-xtra.dvi) (emacs-xtra.pdf): Use $<. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 1a7d5995a5c..61c8763aad8 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -179,8 +179,8 @@ dist: mkdir emacs-manual-${version} cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \ ${srcdir}/ChangeLog* emacs-manual-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \ - -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ + sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ + -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ ${srcdir}/Makefile.in > emacs-manual-${version}/Makefile tar -cf emacs-manual-${version}.tar emacs-manual-${version} diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index a2e5e1a44c3..bfeb61dd0d0 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (dist): Anchor regexps. + * Makefile.in (${infodir}/eintr, emacs-lisp-intro.dvi) (emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $<. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 7a33190273c..c30bf557eed 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -90,8 +90,8 @@ dist: cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \ ${texinfodir}/texinfo.tex \ ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \ - -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ + sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ + -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version} diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 0c1a4039f19..28b7b0b3181 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,7 @@ 2010-10-09 Glenn Morris + * Makefile.in (dist): Anchor regexps. + * Makefile.in (srcs): Put elisp.texi first. ($(infodir)/elisp, elisp.dvi, elisp.pdf): Use $<. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index e40413b23be..9e12d9d188e 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -143,9 +143,9 @@ dist: cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \ $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \ ${srcdir}/README emacs-lispref-${version}/ - sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \ - -e 's/\(emacsdir *=\).*/\1 ./' \ - -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ + sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ + -e 's/^\(emacsdir *=\).*/\1 ./' \ + -e 's/^\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ ${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile tar -cf emacs-lispref-${version}.tar emacs-lispref-${version} -- 2.39.5