From e4ed201ff9e089d8a074523ca7de02c1b84bece2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 8 Nov 2014 18:02:51 -0800 Subject: Replace doc/*/Makefile.in dist rules with code in admin/admin.el * admin/admin.el (make-manuals-dist-output-variables) (make-manuals-dist--1, make-manuals-dist): New. Replaces doc/*/Makefile.in `dist' rules. * doc/emacs/Makefile.in (version): Remove variable. (clean): No longer delete dist tarfile. (dist): Remove rule; replace with code in admin.el. * doc/lispintro/Makefile.in (version): Remove variable. (clean): No longer delete dist tarfile. (dist): Remove rule; replace with code in admin.el. * doc/lispref/Makefile.in (version): Remove variable. (clean): No longer delete dist tarfile. (dist): Remove rule; replace with code in admin.el. * doc/misc/Makefile.in (version): Remove variable. (clean): No longer delete dist tarfile. (dist): Remove rule; replace with code in admin.el. --- doc/lispintro/ChangeLog | 6 ++++++ doc/lispintro/Makefile.in | 41 ----------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-) (limited to 'doc/lispintro') diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index fb9c18626ab..7dfae71f43d 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,9 @@ +2014-11-09 Glenn Morris + + * Makefile.in (version): Remove variable. + (clean): No longer delete dist tarfile. + (dist): Remove rule; replace with code in admin.el. + 2014-10-20 Glenn Morris * emacs-lisp-intro.texi (Autoload): Update loaddefs.el details. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index f88a8cb419b..246de23e26b 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -19,10 +19,7 @@ SHELL = @SHELL@ -# 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. @@ -110,7 +107,6 @@ mostlyclean: clean: mostlyclean rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) - rm -f emacs-lispintro-${version}.tar* distclean: clean rm -f Makefile @@ -120,43 +116,6 @@ infoclean: maintainer-clean: distclean infoclean -.PHONY: dist - -dist: - rm -rf emacs-lispintro-${version} - mkdir emacs-lispintro-${version} - cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \ - ${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@//' \ - -e 's|@SH[E]LL@|/bin/bash|' \ - -e 's|@[p]refix@|/usr/local|' \ - -e 's|@[d]atarootdir@|$${prefix}/share|' \ - -e 's|@[d]atadir@|$${datarootdir}|' \ - -e 's|@[P]ACKAGE_TARNAME@|emacs|' \ - -e 's|@[d]ocdir@|$${datarootdir}/doc/$${PACKAGE_TARNAME}|' \ - -e 's|@[d]vidir@|$${docdir}|' \ - -e 's|@[h]tmldir@|$${docdir}|' \ - -e 's|@[p]dfdir@|$${docdir}|' \ - -e 's|@[p]sdir@|$${docdir}|' \ - -e 's|@[G]ZIP_PROG@|gzip|' \ - -e 's|@IN[S]TALL@|install -c|' \ - -e 's|@IN[S]TALL_DATA@|$${INSTALL} -m 644|' \ - -e '/@[c]onfigure_input@/d' \ - ${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} - - .PHONY: install-dvi install-html install-pdf install-ps install-doc install-dvi: dvi -- cgit v1.2.1