aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorStefan Monnier2013-05-15 16:12:53 -0400
committerStefan Monnier2013-05-15 16:12:53 -0400
commit6e911150d00fa20c60b91d51aafd2cfd81e1c349 (patch)
treefe6c39330104f48b37851d5cb773e1a96b683ba5 /admin
parent1aa8d50570ea4ad6e57d1b2476b5338357a5ac74 (diff)
downloademacs-6e911150d00fa20c60b91d51aafd2cfd81e1c349.tar.gz
emacs-6e911150d00fa20c60b91d51aafd2cfd81e1c349.zip
Use just DOC instead of DOC-nn.mm.
* lisp/loadup.el: Just use unversioned DOC. * Makefile.in (install-doc): DOC file is not version specific any more. * .bzrignore: Don't ignore DOC-* any more. * admin/quick-install-emacs: Don't prune DOC-* files a any more. * doc/lispref/loading.texi (Autoload): * doc/lispref/help.texi (Documentation Basics, Accessing Documentation) (Accessing Documentation, Accessing Documentation): DOC-* is now DOC. * etc/.gitignore: Don't ignore DOC-* any more. * lib-src/makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. * msdos/sed1x.inp: Don't rewrite DOC any more. * nt/makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. * src/Makefile.in (bootstrap-clean): DOC-* doesn't exist any more. * src/makefile.w32-in (DOC): Use just "DOC".
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rwxr-xr-xadmin/quick-install-emacs8
2 files changed, 6 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 5ae948ad192..01a6a3ae170 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * quick-install-emacs: Don't prune DOC-* files a any more.
4
12013-05-14 Glenn Morris <rgm@gnu.org> 52013-05-14 Glenn Morris <rgm@gnu.org>
2 6
3 * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/. 7 * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index e74a2a5af49..98bd61f839d 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -105,8 +105,8 @@ and build directories reside.
105 105
106Optionally, $me can also remove old versions of 106Optionally, $me can also remove old versions of
107automatically generated files that are version-specific (such as the 107automatically generated files that are version-specific (such as the
108versioned emacs executables in the \`src' directory, and the DOC-* files 108versioned emacs executables in the \`src' directory).
109in the \`etc' directory). The latter action is called \`pruning,' and 109The latter action is called \`pruning,' and
110can be enabled using the \`-p' or \`--prune' options. 110can be enabled using the \`-p' or \`--prune' options.
111EOF 111EOF
112 exit 0 112 exit 0
@@ -209,10 +209,6 @@ maybe_mkdir "$DST_INFO"
209 209
210PRUNED="" 210PRUNED=""
211if test x"$PRUNE" != xno; then 211if test x"$PRUNE" != xno; then
212 for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do
213 echo $REMOVE_CMD $D
214 PRUNED="$PRUNED $D"
215 done
216 for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do 212 for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
217 echo $REMOVE_CMD $D 213 echo $REMOVE_CMD $D
218 PRUNED="$PRUNED $D" 214 PRUNED="$PRUNED $D"