From 6e911150d00fa20c60b91d51aafd2cfd81e1c349 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 15 May 2013 16:12:53 -0400 Subject: 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". --- nt/ChangeLog | 4 ++++ nt/README.W32 | 2 +- nt/makefile.w32-in | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'nt') diff --git a/nt/ChangeLog b/nt/ChangeLog index 2a602be59c9..b66871e319b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Stefan Monnier + + * makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more. + 2013-05-08 Juanma Barranquero * config.nt: Sync with autogen/config.in. diff --git a/nt/README.W32 b/nt/README.W32 index 19c148bbf0b..a2881ce1914 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -29,7 +29,7 @@ See the end of the file for license conditions. Along with this file should be six subdirectories (bin, etc, info, lisp, leim, site-lisp). If you have downloaded the barebin distribution, then it will contain only the bin directory and the - built in documentation in etc/DOC-X, the rest of the subdirectories + built in documentation in etc/DOC, the rest of the subdirectories are in the src distribution, which the barebin distribution is designed to be used with. diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index d3e1c8e2228..4aa1ea91d44 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -313,7 +313,7 @@ clean: clean-other-dirs-$(MAKETYPE) - $(DEL) $(COMPILER_TEMP_FILES) - $(DEL_TREE) $(OBJDIR) - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) ../etc/DOC clean-other-dirs-nmake: cd ..\lib @@ -373,7 +373,7 @@ top-distclean: - $(DEL_TREE) oo - $(DEL_TREE) oo-spd - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) ../etc/DOC - $(DEL) config.log Makefile - $(DEL) ../README.W32 -- cgit v1.2.1