[Emacs-diffs] trunk r114088: Tweak to Makefile rules that list *.el files

[Glenn Morris]

------------------------------------------------------------
revno: 114088
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15170
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-08-31 19:12:32 -0700
message:
  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".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-01 01:29:50 +0000
+++ b/lisp/ChangeLog    2013-09-01 02:12:32 +0000
@@ -1,5 +1,9 @@
 2013-09-01  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2013-08-28 06:01:52 +0000
+++ b/lisp/Makefile.in  2013-09-01 02:12:32 +0000
@@ -118,7 +118,7 @@
 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_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_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
 

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-08-28 06:01:52 +0000
+++ b/test/ChangeLog    2013-09-01 02:12:32 +0000
@@ -1,3 +1,9 @@
+2013-09-01  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-08-28 06:01:52 +0000
+++ b/test/automated/Makefile.in        2013-09-01 02:12:32 +0000
@@ -52,7 +52,7 @@
 setwins=subdirs=`find . -type d -print`; \
        for file in $$subdirs; do \
           case $$file in */.* | */.*/* | */=* | ./data* ) ;; \
-               *) wins="$$wins $$file" ;; \
+               *) wins="$$wins$${wins:+ }$$file" ;; \
           esac; \
         done