diff options
| author | Stefan Monnier | 2013-05-15 16:12:53 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-05-15 16:12:53 -0400 |
| commit | 6e911150d00fa20c60b91d51aafd2cfd81e1c349 (patch) | |
| tree | fe6c39330104f48b37851d5cb773e1a96b683ba5 /lib-src | |
| parent | 1aa8d50570ea4ad6e57d1b2476b5338357a5ac74 (diff) | |
| download | emacs-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 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bd7618e0a82..63108cae9a9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. | ||
| 4 | |||
| 1 | 2013-05-06 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-05-06 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo, | 7 | * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo, |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 5ec559ff985..9656a3badec 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -292,10 +292,10 @@ $(DOC): stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(l | |||
| 292 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) | 292 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) |
| 293 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2) | 293 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2) |
| 294 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT) | 294 | "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT) |
| 295 | $(CP) $(DOC) ../etc/DOC-X | 295 | $(CP) $(DOC) ../etc/DOC |
| 296 | - mkdir "../src/$(OBJDIR)" | 296 | - mkdir "../src/$(OBJDIR)" |
| 297 | - mkdir "../src/$(OBJDIR)/etc" | 297 | - mkdir "../src/$(OBJDIR)/etc" |
| 298 | $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X | 298 | $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC |
| 299 | 299 | ||
| 300 | {$(BLD)}.$(O){$(BLD)}.exe: | 300 | {$(BLD)}.$(O){$(BLD)}.exe: |
| 301 | $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS) | 301 | $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS) |