[Emacs-diffs] trunk r115006: Guard against possible accidental matches with parent dirs in Makefiles

[Glenn Morris]

------------------------------------------------------------
revno: 115006
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-06 12:56:48 -0500
message:
  Guard against possible accidental matches with parent dirs in Makefiles
  
  * lisp/Makefile.in (setwins_almost, setwins_for_subdirs):
  Avoid accidental matches.
  
  * test/automated/Makefile.in (setwins): Avoid accidental matches.
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-11-06 17:18:02 +0000
+++ b/lisp/ChangeLog    2013-11-06 17:56:48 +0000
@@ -1,3 +1,8 @@
+2013-11-06  Glenn Morris  <address@hidden>
+
+       * Makefile.in (setwins_almost, setwins_for_subdirs):
+       Avoid accidental matches.
+
 2013-11-06  Stefan Monnier  <address@hidden>
 
        * menu-bar.el (popup-menu): Use key-binding.

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2013-11-06 08:37:01 +0000
+++ b/lisp/Makefile.in  2013-11-06 17:56:48 +0000
@@ -117,14 +117,14 @@
 
 # Find all subdirectories except `obsolete' and `term'.
 setwins_almost=for file in `find ${srcdir} -type d -print`; do \
-          case $$file in */obsolete | */term ) ;; \
+          case $$file in ${srcdir}*/obsolete | ${srcdir}*/term ) ;; \
                *) wins="$$wins$${wins:+ }$$file" ;; \
           esac; \
         done
 
 # Find all subdirectories in which we might want to create subdirs.el.
 setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
-          case $$file in */cedet* ) ;; \
+          case $$file in ${srcdir}*/cedet* ) ;; \
                *) wins="$$wins$${wins:+ }$$file" ;; \
           esac; \
         done

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-06 08:33:02 +0000
+++ b/test/ChangeLog    2013-11-06 17:56:48 +0000
@@ -1,3 +1,7 @@
+2013-11-06  Glenn Morris  <address@hidden>
+
+       * automated/Makefile.in (setwins): Avoid accidental matches.
+
 2013-11-06  Michael Albinus  <address@hidden>
 
        * automated/tramp-tests.el (tramp-test07-file-exists-p):

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-05 02:58:40 +0000
+++ b/test/automated/Makefile.in        2013-11-06 17:56:48 +0000
@@ -39,9 +39,8 @@
        LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`find $(srcdir) -type d -print`; \
-       for file in $$subdirs; do \
-          case $$file in */data* | */flymake* ) ;; \
+setwins=for file in `find $(srcdir) -type d -print`; do \
+          case $$file in $(srcdir)*/data* | $(srcdir)*/flymake* ) ;; \
                *) wins="$$wins$${wins:+ }$$file" ;; \
           esac; \
         done