diff options
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/Makefile.in | 15 |
2 files changed, 19 insertions, 0 deletions
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 <rgm@gnu.org> + + * Makefile.in (dist): Update for new output variables. + 2014-10-06 Glenn Morris <rgm@gnu.org> * 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; \ |