summaryrefslogtreecommitdiff
path: root/msdos
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-05-15 16:12:53 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-05-15 16:12:53 -0400
commit6e911150d00fa20c60b91d51aafd2cfd81e1c349 (patch)
treefe6c39330104f48b37851d5cb773e1a96b683ba5 /msdos
parent1aa8d50570ea4ad6e57d1b2476b5338357a5ac74 (diff)
downloademacs-6e911150d00fa20c60b91d51aafd2cfd81e1c349.tar.gz
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 'msdos')
-rw-r--r--msdos/ChangeLog4
-rw-r--r--msdos/sed1x.inp2
2 files changed, 5 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 87a135cad2d..0214b6bc98b 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * sed1x.inp: Don't rewrite DOC any more.
+
2013-02-08 Paul Eggert <eggert@cs.ucla.edu>
* sedlibmk.inp: Sync with changes in lib/Makefile.in.
diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index 9134bc73d28..dacfee6d385 100644
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -17,7 +17,7 @@
# ----------------------------------------------------------------------
s!^ cd \${oldXMenudir}; \${MAKE}.*$! ${MAKE} -C ${oldXMenudir}.!
s!^ @true *$! @rem!
-s/DOC/DOC-X/g
+#s/DOC/DOC-X/g
/^OLDXMENU *=/s!=.*!= ${oldXMenudir}libXMenu11.a!
/^LIBXMENU *=/s!= *!= ${OLDXMENU}!
/^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!