2 files changed, 7 insertions, 1 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index bbc841585d1..7b39097d3b5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-01  Glenn Morris  <rgm@gnu.org>
+
+        * automated/Makefile.in (setwins): Avoid leading space in $wins.
+        Otherwise the sed command used by eg compile-main ends up
+        containing "/*.el".  (Bug#15170)
+
 2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 5e0ca182c65..bf8e62f77cd 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -52,7 +52,7 @@ emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
 setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | ./data* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done