Mercurial > emacs
changeset 95431:a86a38ec3662
(compile-last): Replace tr in `els' assignment with sed. Remove shell
variable `elc'. Split tests to hopefully be more portable. Fix `sel'
assignment.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 31 May 2008 02:23:47 +0000 |
| parents | 04a952ac356f |
| children | e18e11dca65b |
| files | lisp/Makefile.in |
| diffstat | 1 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/Makefile.in Fri May 30 21:07:50 2008 +0000 +++ b/lisp/Makefile.in Sat May 31 02:23:47 2008 +0000 @@ -89,7 +89,7 @@ esac; \ done -# Find all subdirectories except `obsolete'. +# Find all subdirectories except `obsolete' and `term'. setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \ for file in $$subdirs; do \ @@ -1271,17 +1271,15 @@ ## In case any files are missing from ELCFILES. compile-last: @wd=$(lisp); $(setwins); \ - els=`echo $$wins | tr ' \011' '\012\012' | \ - sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ + els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \ for el in $(COMPILE_FIRST) $$els; do \ - elc=$${el}c; \ - if test -f $$el && ! test -f $$elc && \ - ! grep 'no-byte-compile: t' $$el > /dev/null; then \ - sel=`echo $el | sed "s|^$$lisp|\$$(lisp)|"`; \ - echo "Maintainer warning: $$sel missing from \$$ELCFILES?"; \ - echo "Compiling $$el"; \ - $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $$el || exit 1; \ - fi \ + test -f $$el || continue; \ + test -f $${el}c && continue; \ + grep 'no-byte-compile: t' $$el > /dev/null && continue; \ + sel=`echo $$el | sed "s|^$(lisp)|\\$$(lisp)|"`; \ + echo "Maintainer warning: $$sel missing from \$$ELCFILES?"; \ + echo "Compiling $$el"; \ + $(emacs) $(BYTE_COMPILE_EXTRA_FLAGS) -f batch-byte-compile $$el || exit 1; \ done compile-calc: