merge master

2 files changed, 7 insertions, 1 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 70d1714f8eb..e692ca0dbfd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix a couple of AM_V_GEN bugs
+        * unidata/Makefile.in (unifiles): Use AM_V_at instead of AM_V_GEN,
+        since this doesn't generate a file.
+
 2015-01-15  Eli Zaretskii  <eliz@gnu.org>
 
         * unidata/uvs.el (uvs-print-table-ivd): Call set-binary-mode on
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 1396f0926f4..6c81d32484a 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -90,7 +90,7 @@ ${unidir}/charprop.el: ${srcdir}/unidata-gen.el \
 ## to generate a Makefile fragment explicitly listing the uni- files,
 ## which this file could include.  If no fragment, rebuild everything.
 unifiles: ${unidir}/charprop.el
-        $(AM_V_GEN)for f in `sed -n 's/^;; FILE: //p' < $<`; do \
+        $(AM_V_at)for f in `sed -n 's/^;; FILE: //p' < $<`; do \
           [ -f $(unidir)/$$f ] || exec $(MAKE) PHONY_EXTRAS=$< $<; \
         done