Tweak to Makefile rules that list *.el files

* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
* test/automated/Makefile.in (setwins):
Avoid leading space in $wins.  Otherwise the sed command used by
eg compile-main ends up containing "/*.el".

Fixes: debbugs:15170

4 files changed, 14 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dda52f82ed..be8caf189d2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-09-01  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+        Avoid leading space in $wins.  Otherwise the sed command used by
+        eg compile-main ends up containing "/*.el".  (Bug#15170)
+
         * frame.el (frame-background-mode): Doc fix.  (Bug#15226)
 
 2013-08-30  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index c71fb37e62c..4fba1053dfa 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -118,7 +118,7 @@ emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
@@ -126,7 +126,7 @@ setwins=subdirs=`find . -type d -print`; \
 setwins_almost=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
@@ -134,7 +134,7 @@ setwins_almost=subdirs=`find . -type d -print`; \
 setwins_for_subdirs=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
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