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.
This commit is contained in:
Glenn Morris 2013-11-06 12:56:48 -05:00
parent 5ca114d1a8
commit 6b4ac03ebe
4 changed files with 13 additions and 5 deletions

View file

@ -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.

View file

@ -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

View file

@ -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):

View file

@ -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