(update-elclist): Work around non-portability of "\" in various

implementations of echo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afcee6d44eb3eed4c296f10f6247f383cfd56502..bf1a3e309fd757d2fec911f86c36789dce52203f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-28  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (update-elclist): Work around non-portability of "\"
+       in various implementations of echo.
+
 2008-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * international/mule-diag.el (describe-current-coding-system):

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 848492f864d952a218a14927c989b2c560bb8f4d..4f7ed58eda7b7c9ecf6e5b66ac37df350ef2cd88 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -162,9 +162,13 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 ## 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.
+## "echo" is non-portable with regards to backslashes, eg between zsh
+## and bash.  Hence the used of sed on line 2 below (the ones on line
+## 1 seem to be OK).
+## http://lists.gnu.org/archive/html/emacs-devel/2008-05/msg01535.html
 update-elclist:
        echo "/^ELCFILES/,/^$$/c\\" > temp.sed
-       echo "ELCFILES = \\\\\\" >> temp.sed
+       echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> 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