From 09af5c3e89979e90113f4c21eb8cb5cfe3ff9a07 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 19 Jun 2013 00:01:22 -0700 Subject: [PATCH] Add make dist rule for doc/misc/Makefile, for www.gnu.org * doc/misc/Makefile.in (version): New, set by configure. (clean): Delete dist tar file. (infoclean): New, split from maintainer-clean. (maintainer-clean): Run infoclean. (dist): New rule, to make tarfile for www.gnu.org. --- doc/misc/ChangeLog | 8 ++++++++ doc/misc/Makefile.in | 27 ++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 0837c8e06f2..0f45b7ccfd7 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,11 @@ +2013-06-19 Glenn Morris + + * Makefile.in (version): New, set by configure. + (clean): Delete dist tar file. + (infoclean): New, split from maintainer-clean. + (maintainer-clean): Run infoclean. + (dist): New rule, to make tarfile for www.gnu.org. + 2013-06-13 Albert Krewinkel * sieve.texi: (Managing Sieve): Fix port in example, fix documentation diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index add1b42a545..c994a748ce9 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -24,6 +24,8 @@ SHELL = /bin/sh # set by the configure script's `--srcdir' option. srcdir=@srcdir@ +version=@version@ + ## Where the output files go. buildinfodir = $(srcdir)/../../info ## Directory with emacsver.texi. @@ -719,15 +721,38 @@ mostlyclean: clean: mostlyclean rm -f $(DVI_TARGETS) $(PDF_TARGETS) $(HTML_TARGETS) emacs-faq.text + rm -f emacs-misc-${version}.tar* distclean: clean # rm -f Makefile ## buildinfodir is relative to srcdir. -maintainer-clean: distclean +infoclean: cd $(buildinfodir); for file in $(INFO_TARGETS); do \ file=`echo $${file} | sed 's/\.info$$//'`${INFO_EXT}; \ rm -f $${file} $${file}-[1-9] $${file}-[1-9][0-9]; \ done +maintainer-clean: distclean infoclean + +dist: + rm -rf emacs-misc-${version} + mkdir emacs-misc-${version} + cp ${srcdir}/*.texi ${srcdir}/texinfo.tex \ + $(emacsdir)/emacsver.texi ${srcdir}/ChangeLog* \ + emacs-misc-${version}/ + sed -e 's/@sr[c]dir@/./' \ + -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-misc-${version}/Makefile + @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \ + echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ + fi + tar -cf emacs-misc-${version}.tar emacs-misc-${version} + rm -rf emacs-misc-${version} + ### Makefile ends here -- 2.39.2