From: Glenn Morris Date: Tue, 27 May 2008 02:14:59 +0000 (+0000) Subject: (update-elclist): Make errors in final sed non-fatal. X-Git-Tag: emacs-pretest-23.0.90~5272 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8cb2f3f1dc9c2a9710c112520a88f88600cc2d4;p=emacs.git (update-elclist): Make errors in final sed non-fatal. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9965fa6a27f..2e652280db9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-05-27 Glenn Morris + + * Makefile.in (update-elclist): Make errors in final sed non-fatal. + 2008-05-27 Stefan Monnier * vc-dispatcher.el (vc-string-prefix-p): New function. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 3bec86421ce..848492f864d 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -160,16 +160,18 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) ## single \ at the end of the replacement text). For the last line, ## just use a single "\", for sed. Finally, run sed using the command ## so constructed and update Makefile.in. chmod +w is for CVSREAD=1. +## Errors in final sed are non-fatal, since they have no effect on +## building Emacs. update-elclist: echo "/^ELCFILES/,/^$$/c\\" > temp.sed echo "ELCFILES = \\\\\\" >> temp.sed exclude=`echo $(COMPILE_FIRST) | sed -e 's, ,\\\\|,g' -e 's,\/,\\\\/,g'`; \ ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "/$$exclude/d" -e "s|^$(lisp)| \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed echo "" >> temp.sed - sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || { rm temp-elcfiles temp.sed; exit 1 ; } + -sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles rm temp.sed chmod +w $(lisp)/Makefile.in - mv -f temp-elcfiles $(lisp)/Makefile.in + mv -f temp-elcfiles $(lisp)/Makefile.in || echo "Maintainer warning: failed to update Makefile.in" ## Explicitly list the .elc files, for the sake of parallel builds. ## http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-05/msg00016.html