[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117577: Update doc/ make dist rules
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs-24 r117577: Update doc/ make dist rules |
Date: |
Mon, 13 Oct 2014 01:41:10 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117577
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-10-12 18:40:56 -0700
message:
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.
modified:
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
doc/lispintro/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6128
doc/lispintro/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6130
doc/lispref/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6155
doc/lispref/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6156
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
doc/misc/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-6287
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-10-06 06:34:21 +0000
+++ b/doc/emacs/ChangeLog 2014-10-13 01:40:56 +0000
@@ -1,3 +1,7 @@
+2014-10-13 Glenn Morris <address@hidden>
+
+ * Makefile.in (dist): Update for new output variables.
+
2014-10-06 Glenn Morris <address@hidden>
* package.texi (Package Menu): The package list was changed to not
=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/Makefile.in 2014-10-13 01:40:56 +0000
@@ -207,6 +207,7 @@
## 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 @@
-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; \
=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog 2014-07-15 16:06:49 +0000
+++ b/doc/lispintro/ChangeLog 2014-10-13 01:40:56 +0000
@@ -1,3 +1,7 @@
+2014-10-13 Glenn Morris <address@hidden>
+
+ * Makefile.in (dist): Update for new output variables.
+
2014-07-15 Álvar Jesús Ibeas Martín <address@hidden> (tiny change)
* emacs-lisp-intro.texi (Variables, Buffer Names, if & or)
=== modified file 'doc/lispintro/Makefile.in'
--- a/doc/lispintro/Makefile.in 2014-01-01 07:43:34 +0000
+++ b/doc/lispintro/Makefile.in 2014-10-13 01:40:56 +0000
@@ -135,6 +135,20 @@
-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; \
=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog 2014-10-09 16:07:40 +0000
+++ b/doc/lispref/ChangeLog 2014-10-13 01:40:56 +0000
@@ -1,3 +1,7 @@
+2014-10-13 Glenn Morris <address@hidden>
+
+ * Makefile.in (dist): Update for new output variables.
+
2014-10-09 Glenn Morris <address@hidden>
* elisp.texi (DATE): Bump to October 2014.
=== modified file 'doc/lispref/Makefile.in'
--- a/doc/lispref/Makefile.in 2014-01-10 19:40:32 +0000
+++ b/doc/lispref/Makefile.in 2014-10-13 01:40:56 +0000
@@ -191,6 +191,20 @@
-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; \
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2014-10-04 06:55:37 +0000
+++ b/doc/misc/ChangeLog 2014-10-13 01:40:56 +0000
@@ -1,3 +1,7 @@
+2014-10-13 Glenn Morris <address@hidden>
+
+ * Makefile.in (dist): Update for new output variables.
+
2014-10-04 Glenn Morris <address@hidden>
* vip.texi (Other Vi Commands): Markup fix.
=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in 2014-06-10 21:07:22 +0000
+++ b/doc/misc/Makefile.in 2014-10-13 01:40:56 +0000
@@ -890,6 +890,20 @@
-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; \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117577: Update doc/ make dist rules,
Glenn Morris <=