diff options
| author | Glenn Morris <[email protected]> | 2014-06-11 15:33:14 -0400 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-11 15:33:14 -0400 |
| commit | d29d249207dbb944ea93275ea8b8ea07f59c1e82 (patch) | |
| tree | ed19dc45de0f0822b038df22509ce111b2d5e4ac /doc | |
| parent | b765f1fe83a0df149ad783f7dae8ea01f71e680d (diff) | |
| parent | df907af0ddfc4282a6184f1b516cd92dbdf0093f (diff) | |
Merge from emacs-24; up to 2014-06-02T14:17:[email protected]
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 04df41c7d9..1293166165 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,7 @@ +2014-06-11 Glenn Morris <[email protected]> + + * Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change. + 2014-06-10 Glenn Morris <[email protected]> * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 62f50af0e4..4e9f8f1852 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -72,7 +72,7 @@ INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \ url vhdl-mode vip viper widget wisent woman ## Info files to install on current platform. -INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32) +INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32) ## Info files to build on current platform. ## This is all of them, even though they might not all get installed, |