Mercurial > emacs
comparison lisp/Makefile.in @ 95332:4dfc7920f403
(update-elclist): Make errors in final sed non-fatal.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 27 May 2008 02:14:46 +0000 |
parents | 3edde37f5298 |
children | d797842f5ca1 |
comparison
equal
deleted
inserted
replaced
95331:40d6367d8bf8 | 95332:4dfc7920f403 |
---|---|
158 ## literal " $(lisp)", add trailing " \\\" to the end of every line | 158 ## literal " $(lisp)", add trailing " \\\" to the end of every line |
159 ## (the last \ continues the line in sed, the other \\ result in a | 159 ## (the last \ continues the line in sed, the other \\ result in a |
160 ## single \ at the end of the replacement text). For the last line, | 160 ## single \ at the end of the replacement text). For the last line, |
161 ## just use a single "\", for sed. Finally, run sed using the command | 161 ## just use a single "\", for sed. Finally, run sed using the command |
162 ## so constructed and update Makefile.in. chmod +w is for CVSREAD=1. | 162 ## so constructed and update Makefile.in. chmod +w is for CVSREAD=1. |
163 ## Errors in final sed are non-fatal, since they have no effect on | |
164 ## building Emacs. | |
163 update-elclist: | 165 update-elclist: |
164 echo "/^ELCFILES/,/^$$/c\\" > temp.sed | 166 echo "/^ELCFILES/,/^$$/c\\" > temp.sed |
165 echo "ELCFILES = \\\\\\" >> temp.sed | 167 echo "ELCFILES = \\\\\\" >> temp.sed |
166 exclude=`echo $(COMPILE_FIRST) | sed -e 's, ,\\\\|,g' -e 's,\/,\\\\/,g'`; \ | 168 exclude=`echo $(COMPILE_FIRST) | sed -e 's, ,\\\\|,g' -e 's,\/,\\\\/,g'`; \ |
167 ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "/$$exclude/d" -e "s|^$(lisp)| \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed | 169 ls $(lisp)/*.elc $(lisp)/*/*.elc | sed -e "/$$exclude/d" -e "s|^$(lisp)| \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed |
168 echo "" >> temp.sed | 170 echo "" >> temp.sed |
169 sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || { rm temp-elcfiles temp.sed; exit 1 ; } | 171 -sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles |
170 rm temp.sed | 172 rm temp.sed |
171 chmod +w $(lisp)/Makefile.in | 173 chmod +w $(lisp)/Makefile.in |
172 mv -f temp-elcfiles $(lisp)/Makefile.in | 174 mv -f temp-elcfiles $(lisp)/Makefile.in || echo "Maintainer warning: failed to update Makefile.in" |
173 | 175 |
174 ## Explicitly list the .elc files, for the sake of parallel builds. | 176 ## Explicitly list the .elc files, for the sake of parallel builds. |
175 ## http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-05/msg00016.html | 177 ## http://lists.gnu.org/archive/html/bug-gnu-emacs/2008-05/msg00016.html |
176 ## This can probably be done more elegantly, but needs to be portable. | 178 ## This can probably be done more elegantly, but needs to be portable. |
177 ELCFILES = \ | 179 ELCFILES = \ |