aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8e98bdf317..d977495e4f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-03-21 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (all): Depend on `info'. (Bug#16626)
4
12014-03-07 Paul Eggert <eggert@cs.ucla.edu> 52014-03-07 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Merge from gnulib, incorporating: 7 Merge from gnulib, incorporating:
diff --git a/Makefile.in b/Makefile.in
index 76a030407b9..be68df1fd6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -288,7 +288,7 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
288COPYDIR = ${srcdir}/etc ${srcdir}/lisp 288COPYDIR = ${srcdir}/etc ${srcdir}/lisp
289COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" 289COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
290 290
291all: ${SUBDIR} 291all: ${SUBDIR} info
292 292
293.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC 293.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC
294 294