diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-05-16 12:58:56 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-05-16 12:58:56 +0300 |
| commit | a9519e2685d19b13ce4e3e1ba13f97569013627e (patch) | |
| tree | 6a9e0e35514c400749f23c891e9a95577fb9bfc1 /lib-src | |
| parent | 3946d31b7bcf2a7dceacb86598823360f457cd19 (diff) | |
| parent | 2d4bf34b5b83b3728b2fb18a72536f3e14afcf34 (diff) | |
| download | emacs-a9519e2685d19b13ce4e3e1ba13f97569013627e.tar.gz | |
Merge from trunk.
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 @@ +2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> + + * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X. + 2013-05-06 Paul Eggert <eggert@cs.ucla.edu> * 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 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT) - $(CP) $(DOC) ../etc/DOC-X + $(CP) $(DOC) ../etc/DOC - mkdir "../src/$(OBJDIR)" - mkdir "../src/$(OBJDIR)/etc" - $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X + $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC {$(BLD)}.$(O){$(BLD)}.exe: $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS) |