X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e..4f4050696105381b5893f594d719569817a861a3:/doc/lispintro/Makefile.in

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index a6b50b88ad..b60c752e92 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -19,12 +19,16 @@
 
 SHELL = /bin/sh
 
+# NB If you add any more configure variables,
+# update the sed rules in the dist target below.
 srcdir = @srcdir@
 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 +37,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,13 +102,19 @@ 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}/" \
+	  -e 's/@MAKE[I]NFO@/makeinfo/' -e 's/@MK[D]IR_P@/mkdir -p/' \
+	  -e 's/@IN[F]O_EXT@/.info/' -e 's/@IN[F]O_OPTS@//' \
 	  ${srcdir}/Makefile.in > emacs-lispintro-${version}/Makefile
+	@if grep '@[a-zA-Z_]*@' emacs-lispintro-${version}/Makefile; then \
+	  echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
+	fi
 	tar -cf emacs-lispintro-${version}.tar emacs-lispintro-${version}
 	rm -rf emacs-lispintro-${version}