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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 619bca2076bfd01c90cfaa828d4c4f74c57bd4ab..be01a0cdc2987027f0635c71e488849b9a36fd82 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-06  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (setwins_almost, setwins_for_subdirs):
+       Avoid accidental matches.
+
 2013-11-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * menu-bar.el (popup-menu): Use key-binding.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9dd5a40de024d822f7eb5511cf52146edf6cf23b..d00330c3a9b53112a29bd242b3efc41c4c2457de 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -117,14 +117,14 @@ setwins=for file in `find . -type d -print`; do \
 
 # 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

diff --git a/test/ChangeLog b/test/ChangeLog
index e032af46af0e778ac4b45799f95c7d509515197f..281ce981b5e326a92907bafc78b7d7a962f27a2d 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Glenn Morris  <rgm@gnu.org>
+
+       * automated/Makefile.in (setwins): Avoid accidental matches.
+
 2013-11-06  Michael Albinus  <michael.albinus@gmx.de>
 
        * automated/tramp-tests.el (tramp-test07-file-exists-p):

diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 63cffd9f828faa2486ea59934ebfe30005740f86..617768995f1694417ee6eabf250c154a4c9eff0d 100644 (file)
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -39,9 +39,8 @@ emacs = unset EMACSLOADPATH; \
        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