Commit 7410c4e8 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

parents b1d5ab03 be3e1b61
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
2014-10-12 Paul Eggert <eggert@cs.ucla.edu>
* macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)
......
......@@ -209,6 +209,7 @@ bootstrap-clean 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}
......@@ -219,6 +220,21 @@ dist:
-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-manual-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-manual-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
2014-07-16 Álvar Jesús Ibeas Martín <alvar.ibeas@unican.es> (tiny change)
* emacs-lisp-intro.texi (Variables, Buffer Names, if & or)
......
......@@ -134,6 +134,21 @@ dist:
-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; \
......
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
2014-10-12 Glenn Morris <rgm@gnu.org>
* elisp.texi (DATE): Bump to October 2014.
......
......@@ -192,6 +192,21 @@ dist:
-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-lispref-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-lispref-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
2014-10-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (dist): Update for new output variables.
2014-10-08 Leo Liu <sdl.web@gmail.com>
* cl.texi (Porting Common Lisp): Remove parse-integer.
......
......@@ -251,6 +251,21 @@ dist:
-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-misc-${version}/Makefile
@if grep '@[a-zA-Z_]*@' emacs-misc-${version}/Makefile; then \
echo "Unexpanded configure variables in Makefile?" 1>&2; exit 1; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment