[Emacs-diffs] Changes to emacs/lisp/Makefile.in,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/05/27 02:14:47

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- Makefile.in 24 May 2008 02:26:37 -0000      1.122
+++ Makefile.in 27 May 2008 02:14:46 -0000      1.123
@@ -160,16 +160,18 @@
 ## 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