From: Glenn Morris Date: Mon, 13 Oct 2014 01:40:56 +0000 (-0700) Subject: Update doc/ make dist rules X-Git-Tag: emacs-24.4-rc1~15 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be3e1b61b5e6ce5c49fd845e549639362333ab58;p=emacs.git Update doc/ make dist rules * emacs/Makefile.in (dist): * lispintro/Makefile.in (dist): * lispref/Makefile.in (dist): * misc/Makefile.in (dist): Update for new output variables. --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index af7db4bf383..1626a156ea1 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2014-10-13 Glenn Morris + + * Makefile.in (dist): Update for new output variables. + 2014-10-06 Glenn Morris * package.texi (Package Menu): The package list was changed to not diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 4a59ebed521..1d686959934 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -207,6 +207,7 @@ maintainer-clean: distclean infoclean ## Make a standalone tarfile of the Emacs manual sources. ## The [c] is a dumb way to prevent configure expanding it. +## TODO this is getting increasingly lengthy; not sure it is worth keeping. dist: rm -rf emacs-manual-${version} mkdir emacs-manual-${version} @@ -218,6 +219,20 @@ dist: -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-manual-${version}/Makefile @if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index c1607487b6f..72c6023bba7 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2014-10-13 Glenn Morris + + * Makefile.in (dist): Update for new output variables. + 2014-07-15 Álvar Jesús Ibeas Martín (tiny change) * emacs-lisp-intro.texi (Variables, Buffer Names, if & or) diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index c041cd17e02..f88a8cb419b 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -135,6 +135,20 @@ dist: -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; \ diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 56215f8c858..272f21f4570 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2014-10-13 Glenn Morris + + * Makefile.in (dist): Update for new output variables. + 2014-10-09 Glenn Morris * elisp.texi (DATE): Bump to October 2014. diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index bb8d4f82884..fdb643e0fc8 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -191,6 +191,20 @@ dist: -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-lispref-${version}/Makefile @if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \ diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 9c3ca5dd120..f4291479ce1 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-13 Glenn Morris + + * Makefile.in (dist): Update for new output variables. + 2014-10-04 Glenn Morris * vip.texi (Other Vi Commands): Markup fix. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index d7562892615..4254ebefde7 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -890,6 +890,20 @@ dist: -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-misc-${version}/Makefile @if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \ echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \