diff options
| author | jave | 2015-01-04 09:09:36 +0100 |
|---|---|---|
| committer | jave | 2015-01-04 09:09:36 +0100 |
| commit | a7e2c92ddf6c27b2cfcc9782fd71f15d36162cce (patch) | |
| tree | 7e092998b7e6956f311a169e0d87254ef87703e3 /lib-src | |
| parent | db4613576d3115aa320f0293d081ce98baa06acd (diff) | |
| parent | fec9b792f543c35b1a635b3a3326d496e3ca9012 (diff) | |
| download | emacs-a7e2c92ddf6c27b2cfcc9782fd71f15d36162cce.tar.gz emacs-a7e2c92ddf6c27b2cfcc9782fd71f15d36162cce.zip | |
merge master
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index eb2b1f3a94c..1795f021027 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Less 'make' chatter for lib-src | ||
| 4 | * Makefile.in (blessmail): Less 'make' chatter here. | ||
| 5 | |||
| 1 | 2014-12-27 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-12-27 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT}) | 8 | * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT}) |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 485e2d2eacc..22a5ecad8d8 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -223,8 +223,8 @@ $(EXE_FILES): ../lib/libgnu.a | |||
| 223 | ## Only used if we need blessmail, but no harm in always defining. | 223 | ## Only used if we need blessmail, but no harm in always defining. |
| 224 | ## This makes the actual blessmail executable. | 224 | ## This makes the actual blessmail executable. |
| 225 | blessmail: $(srcdir)/../lisp/mail/blessmail.el | 225 | blessmail: $(srcdir)/../lisp/mail/blessmail.el |
| 226 | $(EMACS) $(EMACSOPT) -l $< | 226 | $(AM_V_GEN)$(EMACS) $(EMACSOPT) -l $< |
| 227 | chmod +x $@ | 227 | $(AM_V_at)chmod +x $@ |
| 228 | 228 | ||
| 229 | ## This checks if we need to run blessmail. | 229 | ## This checks if we need to run blessmail. |
| 230 | ## Do not charge ahead and do it! Let the installer decide. | 230 | ## Do not charge ahead and do it! Let the installer decide. |