diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-04-23 20:58:23 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-04-23 20:58:23 -0400 |
| commit | 09b98a01c11d1b7d25e9d40f6bb84cb5fa73f7db (patch) | |
| tree | 5cf07344a4d71c65d113b043ea4f94947fd6f801 /doc/lispintro/Makefile.in | |
| parent | edbf45693574f38188d102e9ff617e06c940fe20 (diff) | |
| download | emacs-09b98a01c11d1b7d25e9d40f6bb84cb5fa73f7db.tar.gz | |
Minor lispintro tweaks
* doc/lispintro/Makefile.in (emacsdir): New variable..
(MAKEINFO_OPTS, ENVADD): Add $emacsdir.
(srcs): Add emacsver.texi.
(dist): Include emacsver.texi. Edit emacsdir.
* doc/lispintro/emacs-lisp-intro.texi (emacsver.texi): Include it.
(copying): For non-printed versions, uses Emacs version rather
than that of the printed book.
(Complications, Lisp macro, defvar and asterisk, defcustom): Copyedits.
* doc/lispintro/makefile.w32-in (emacsdir): New variable.
(INFO_SOURCES): Add emacsver.texi.
(ENVADD): Add $emacsdir (and $texinfodir).
Diffstat (limited to 'doc/lispintro/Makefile.in')
| -rw-r--r-- | doc/lispintro/Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index a6b50b88ad9..338b4ad86c4 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -25,6 +25,8 @@ version=@version@ buildinfodir = $(srcdir)/../../info # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc +# Directory with emacsver.texi. +emacsdir = $(srcdir)/../emacs MKDIR_P = @MKDIR_P@ @@ -33,17 +35,18 @@ INFO_EXT=@INFO_EXT@ INFO_OPTS=@INFO_OPTS@ MAKEINFO = @MAKEINFO@ -MAKEINFO_OPTS = --force -I $(srcdir) +MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ +ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" mkinfodir = @${MKDIR_P} ${buildinfodir} -srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi +srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \ + ${emacsdir}/emacsver.texi .PHONY: info dvi html pdf ps @@ -97,9 +100,10 @@ dist: rm -rf emacs-lispintro-${version} mkdir emacs-lispintro-${version} cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \ - ${texinfodir}/texinfo.tex \ + ${texinfodir}/texinfo.tex ${emacsdir}/emacsver.texi \ ${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/ sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \ + -e 's/^\(emacsdir *=\).*/\1 ./' \ -e 's/^\(buildinfodir *=\).*/\1 ./' \ -e 's/^\(clean:.*\)/\1 infoclean/' \ -e "s/@ver[s]ion@/${version}/" \ |